diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..bee8a64b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+__pycache__
diff --git a/autorandr/__init__.py b/autorandr/__init__.py
new file mode 100644
index 00000000..f29eb418
--- /dev/null
+++ b/autorandr/__init__.py
@@ -0,0 +1,100 @@
+# -*- coding: utf-8 -*-
+
+"""Load and save autorandr configs.
+
+Load and save  configs. Requires autorandr to be installed.
+
+Synopsis: <trigger> [load|save] <config>"""
+
+from albertv0 import *
+import os
+import subprocess
+from time import sleep
+
+
+__iid__ = "PythonInterface/v0.2"
+__prettyname__ = "Autorandr"
+__version__ = "1.0"
+__trigger__ = "ar "
+__author__ = "Rhys Tyers"
+__dependencies__ = ["autorandr"]
+
+configurations = []
+
+def initialize():
+    global configurations
+    result = subprocess.run(["autorandr", "--detected"], stdout=subprocess.PIPE)
+    result.stdout.decode('utf-8')
+    configurations = result.stdout.decode().split()
+
+def handleQuery(query):
+    if not query.isTriggered:
+        return
+
+    queryList = query.string.split()
+    results = []
+
+    # Load
+    if queryList[0] != 'load' and 'load'.startswith(queryList[0]):
+        item = Item(id=__prettyname__,
+                    icon=os.path.dirname(__file__)+"/monitor.svg",
+                    text="Load",
+                    subtext="Load a saved xrandr configuration",
+                    completion=__trigger__ + 'load ',
+                    urgency=ItemBase.Alert,
+                    actions=[])
+        results.append(item)
+    if queryList[0] == 'load':
+        for configuration in configurations:
+            if len(queryList) < 2 or configuration.startswith(queryList[1]):
+                item = Item(id=__prettyname__,
+                            icon=os.path.dirname(__file__)+"/monitor.svg",
+                            text="Load " + configuration,
+                            subtext="Load the " + configuration + " xrandr configuration",
+                            completion=__trigger__ + 'load ' + configuration,
+                            urgency=ItemBase.Alert,
+                            actions=[
+                                ProcAction(text="ProcAction",
+                                        commandline=["autorandr", "--change", configuration],
+                                        )
+                            ])
+                results.append(item)
+    
+    # Save
+    if queryList[0] != 'save' and 'save'.startswith(queryList[0]):
+        item = Item(id=__prettyname__,
+                    icon=os.path.dirname(__file__)+"/monitor.svg",
+                    text="Save",
+                    subtext="Save the current xrandr configuration",
+                    completion=__trigger__ + 'save ',
+                    urgency=ItemBase.Alert,
+                    actions=[])
+        results.append(item)
+    if queryList[0] == 'save':
+        item = Item(id=__prettyname__,
+                    icon=os.path.dirname(__file__)+"/monitor.svg",
+                    text="Save " + queryList[1],
+                    subtext="Save the current xrandr configuration as " + queryList[1],
+                    urgency=ItemBase.Alert,
+                    completion=__trigger__ + 'save ',
+                    actions=[
+                        ProcAction(text="ProcAction",
+                                commandline=["autorandr", "--save", queryList[1]],
+                                )
+                    ])
+        results.append(item)
+
+      # refresh
+    if 'refresh'.startswith(queryList[0]):
+        item = Item(id=__prettyname__,
+                    icon=os.path.dirname(__file__)+"/monitor.svg",
+                    text="Refresh",
+                    subtext="Refresh xrandr configuration",
+                    completion=__trigger__ + 'refresh ',
+                    urgency=ItemBase.Alert,
+                    actions=[
+                         FuncAction(initialize)
+                    ])
+        results.append(item)
+
+    return results
diff --git a/autorandr/monitor.svg b/autorandr/monitor.svg
new file mode 100644
index 00000000..bc4b4567
--- /dev/null
+++ b/autorandr/monitor.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 481.6 481.6"><path d="M422.2 24.5H59.4C26.7 24.5 0 51.1 0 83.9V314c0 32.7 26.6 59.4 59.4 59.4h167.9v56.7h-83.7c-7.5 0-13.5 6-13.5 13.5s6 13.5 13.5 13.5H338c7.5 0 13.5-6 13.5-13.5s-6-13.5-13.5-13.5h-83.7v-56.7h167.9c32.7 0 59.4-26.6 59.4-59.4V83.9c0-32.8-26.6-59.4-59.4-59.4zm-362.8 27h362.9c17.8 0 32.4 14.5 32.4 32.4v192.3H27V83.9C27 66 41.5 51.5 59.4 51.5zm362.8 294.9H59.4C41.6 346.4 27 331.9 27 314v-10.8h427.6V314c0 17.8-14.5 32.4-32.4 32.4z"/></svg>
\ No newline at end of file
diff --git a/vpn.py b/vpn.py
new file mode 100644
index 00000000..97d6e4ab
--- /dev/null
+++ b/vpn.py
@@ -0,0 +1,65 @@
+"""VPN Extension
+
+Connect or disconnect from a network manager VPN profile"""
+
+
+import subprocess
+from collections import namedtuple
+from albertv0 import *
+from shutil import which
+
+
+__iid__ = "PythonInterface/v0.2"
+__prettyname__ = "VPN"
+__version__ = "1.0"
+__trigger__ = "vpn "
+__author__ = "janeklb"
+__dependencies__ = ['nmcli']
+
+
+iconPath = iconLookup('network-wireless')
+if not iconPath:
+    iconPath = ":python_module"
+
+VPNConnection = namedtuple('VPNConnection', ['name', 'connected'])
+
+
+def getVPNConnections():
+    consStr = subprocess.check_output(
+        'nmcli -t connection show',
+        shell=True,
+        encoding='UTF-8'
+    )
+    for conStr in consStr.splitlines():
+        con = conStr.split(':')
+        if con[2] == 'vpn':
+            yield VPNConnection(name=con[0], connected=con[3] != '')
+
+
+def buildItem(con):
+    name = con.name
+    command = 'down' if con.connected else 'up'
+    text = f'Connect to {name}' if command == 'up' else f'Disconnect from {name}'
+    commandline = ['nmcli', 'connection', command, 'id', name]
+    return Item(
+        id=f'vpn-{command}-{name}',
+        text=name,
+        subtext=text,
+        icon=iconPath,
+        completion=name,
+        actions=[ ProcAction(text=text, commandline=commandline) ]
+    )
+
+
+def initialize():
+    if which('nmcli') is None:
+        raise Exception("'nmcli' is not in $PATH")
+
+
+def handleQuery(query):
+    if query.isValid and query.isTriggered:
+        connections = getVPNConnections()
+        if query.string:
+            connections = [ con for con in connections if query.string.lower() in con.name.lower() ]
+        return [ buildItem(con) for con in connections ]
+    return []