diff --git a/hosts.yaml b/hosts.yaml
index 5b57b9b..a6fd3e3 100644
--- a/hosts.yaml
+++ b/hosts.yaml
@@ -8,6 +8,7 @@ hosts:
           endpoint: https://webassets.confederationcollege.ca
       - cert_expiration:
           endpoint: webassets.confederationcollege.ca
+          expiration_warning_days: 30
   secureassets:
     hostname: secureassets.confederationcollege.ca
     actions:
@@ -18,6 +19,7 @@ hosts:
       - ping
       - cert_expiration:
           endpoint: cc-cognotest-01.confederationc.on.ca:9300
+          expiration_warning_days: 30
   Solarwinds Service Desk:
     hostname: itsupport.confederationcollege.ca
     actions:
@@ -48,4 +50,9 @@ hosts:
     server: cc-apps-01
     actions:
       - ping
-
+  Gitlab:
+    hostname: cc-gitlab.confederationcollege.ca
+    actions:
+      - cert_expiration:
+          endpoint: cc-gitlab.confederationcollege.ca
+          expiration_warning_days: 30
diff --git a/monimon.py b/monimon.py
index ccb6dea..730e125 100755
--- a/monimon.py
+++ b/monimon.py
@@ -9,7 +9,7 @@ import importlib
 plugins = {}
 for finder, name, ispkg in pkgutil.iter_modules(path=['plugins/plugins']):
     plugins[name] = importlib.import_module(name)
-row_format = "{:<30}{:<10}{:<6}{:<20}"
+row_format = "{:<30} {:<10} {:<6}"
 
 with open('hosts.yaml', 'r') as file:
     hosts = yaml.safe_load(file)
@@ -30,8 +30,8 @@ for host, details in hosts['hosts'].items():
             for argument, value in action[action_name].items():
                 arguments[argument] = value
 
-
         #print(arguments)
         result = getattr(plugins[action_name], action_name)(arguments)
         #print(f"{host}\t{action_name}\t{result[0]}\t{result[1]}")
-        print(row_format.format(host, action_name, result[0], result[1]))
+        print(row_format.format(host, action_name, result[0]))
+        print(f"{result[1]}")
diff --git a/plugins/plugin.py b/plugins/plugin.py
index 624ad86..d456330 100644
--- a/plugins/plugin.py
+++ b/plugins/plugin.py
@@ -1,9 +1,8 @@
 from enum import Enum
 class Plugin:
     class Status(Enum):
-        SUCCESS = "Succ
+        SUCCESS = "Succ"
     i = 12345
 
     def f(self):
         return 'hello world'
-
diff --git a/plugins/plugins/cert_expiration.py b/plugins/plugins/cert_expiration.py
index eef927d..dcf0953 100644
--- a/plugins/plugins/cert_expiration.py
+++ b/plugins/plugins/cert_expiration.py
@@ -1,5 +1,6 @@
-import socket
 import ssl
+import OpenSSL
+from datetime import datetime,timedelta
 
 def cert_expiration(args):
     hostname = args['endpoint'].split(":")[0]
@@ -9,15 +10,17 @@ def cert_expiration(args):
     except IndexError:
         port = 443
 
-    context = ssl.create_default_context()
-
-    with context.wrap_socket(socket.socket(socket.AF_INET),
-                                           server_hostname = hostname) as conn:
-        conn.connect((hostname, int(port)))
-
-        cert = conn.getpeercert()
-
-        return [True, f"Expiration: {cert['notAfter']}"]
-
+    cert = ssl.get_server_certificate((hostname, port))
+    x509 = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM, cert)
+    expiration_date = datetime.strptime(f"{x509.get_notAfter().decode("UTF-8")[0:-1]}UTC", "%Y%m%d%H%M%S%Z") 
 
+    status = "Success"
+    if (expiration_date - timedelta(days = args['expiration_warning_days'])) < datetime.now():
+        status = "Warning"
+    else:
+        status = "Success"
           
+
+    return [status, f"Expiration: {expiration_date}"]
+
+
diff --git a/plugins/plugins/httpcheck.py b/plugins/plugins/httpcheck.py
index b93b7a1..acd4608 100644
--- a/plugins/plugins/httpcheck.py
+++ b/plugins/plugins/httpcheck.py
@@ -3,6 +3,6 @@ import requests
 def httpcheck(arguments):
     try:
         r = requests.head(f"{arguments['endpoint']}")
-        return [True, r.status_code]
+        return ["Success", f"Status code: {r.status_code}"]
     except requests.ConnectionError:
-        return [False, r.status_code]
+        return ["Failure", f"Status code: {r.status_code}"]
diff --git a/plugins/plugins/ping.py b/plugins/plugins/ping.py
index 3d4fd5e..6622c5b 100644
--- a/plugins/plugins/ping.py
+++ b/plugins/plugins/ping.py
@@ -3,13 +3,12 @@ import subprocess
 from plugins import plugin
 
 def ping(arguments):
-    print(plugin.Plugin.i)
     response = subprocess.run(["ping","-c","1",arguments['hostname']], 
                               stdout = subprocess.DEVNULL, stderr = subprocess.PIPE)
     if response.returncode == 0:
-        return [True, ""]
+        return ["Success", ""]
     elif response.stderr:
-        return [False, response.stderr.decode("UTF-8")]
+        return ["Success", response.stderr.decode("UTF-8")]
     else:
-        return [False, ""]
+        return ["Failure", ""]