diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..5a29dd9
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,54 @@
+version: 2.1
+orbs:
+  mattermost-plugin-notify: nathanaelhoun/mattermost-plugin-notify@1.2.0
+jobs:
+  "ruby-2.2":
+  - mattermost-plugin-notify/status:
+          failure_message: This very important job has failed! Ping @senior-developer
+          success_message: 'Life is beautiful, my job has succeeded!'
+          webhook: https://dkh-sandbox.test.mattermost.cloud/plugins/com.github.nathanaelhoun.plugin-circleci/hooks/jvHVYK4lKthVNhRKhBPMgYFTtFytwspq
+    docker:
+      - image: circleci/ruby:2.2-node
+      - image: circleci/postgres:9.4.12-alpine
+    working_directory: ~/circleci-demo-workflows
+    steps:
+      - checkout
+      - run: bundle install --path vendor/bundle
+      - run: bundle exec rake db:create db:schema:load
+      - run:
+          name: Run tests
+          command: rake
+
+  "ruby-2.3":
+    docker:
+      - image: circleci/ruby:2.3-node
+      - image: circleci/postgres:9.4.12-alpine
+    working_directory: ~/circleci-demo-workflows
+    steps:
+      - checkout
+      - run: bundle install --path vendor/bundle
+      - run: bundle exec rake db:create db:schema:load
+      - run:
+          name: Run tests
+          command: rake
+
+  "ruby-2.4":
+    docker:
+      - image: circleci/ruby:2.4-node
+      - image: circleci/postgres:9.4.12-alpine
+    working_directory: ~/circleci-demo-workflows
+    steps:
+      - checkout
+      - run: bundle install --path vendor/bundle
+      - run: bundle exec rake db:create db:schema:load
+      - run:
+          name: Run tests
+          command: rake
+      
+workflows:
+  version: 2
+  build:
+    jobs:
+      - "ruby-2.2"
+      - "ruby-2.3"
+      - "ruby-2.4"
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..dd84ea7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/README.md b/README.md
index b9c65c8..bae843a 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,6 @@
 # hello-world
 Dylan's test repository
-Now with a 3rd line of code
\ No newline at end of file
+Now with a 3rd line of code
+Blah
+
+Text on Line 6
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
new file mode 100644
index 0000000..27a798a
--- /dev/null
+++ b/azure-pipelines.yml
@@ -0,0 +1,19 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+trigger:
+- master
+
+pool:
+  vmImage: ubuntu-latest
+
+steps:
+- script: echo Hello, world!
+  displayName: 'Run a one-line script'
+
+- script: |
+    echo Add other tasks to build, test, and deploy your project.
+    echo See https://aka.ms/yaml
+  displayName: 'Run a multi-line script'
diff --git a/new create b/new create
index c423ab5..d89cafb 100644
--- a/new create	
+++ b/new create	
@@ -1,2 +1,3 @@
 
 Pickles3
+Pickles4 
diff --git a/token-e2e-test.js b/token-e2e-test.js
new file mode 100644
index 0000000..c5f4d8d
--- /dev/null
+++ b/token-e2e-test.js
@@ -0,0 +1,332 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+// ***************************************************************
+// - [#] indicates a test step (e.g. # Go to a page)
+// - [*] indicates an assertion (e.g. * Check the title)
+// - Use element ID when selecting an element. Create one if none.
+// ***************************************************************
+
+import {getRandomId} from '../utils/index';
+import {getAdminAccount} from '../support/env';
+
+const sysadmin = getAdminAccount();
+
+describe('Test AutoLink', function () {
+    let team1;
+    let team2;
+    let regularUser;
+    let channel1;
+    let linkName = `jira${getRandomId()}`;
+
+    before(() => {
+        cy.apiUpdateConfig({
+            PluginSettings: {
+                // # Enable the 'autolink' plugin and enable the admin account for it
+                PluginStates: {'mattermost-autolink': {Enable: true}},
+                Plugins: {'mattermost-autolink': {enableadmincommand: true}},
+            },
+        });
+
+        cy.apiInitSetup().then(({team, user, channel}) => {
+            team1 = team;
+            channel1 = channel;
+            regularUser = user;
+
+            cy.visit(`/${team1.name}/channels/town-square`);
+        });
+
+        cy.apiCreateTeam('test-team2', 'Test Team2').then(({team}) => {
+            team2 = team;
+        });
+
+        // # Install Plugin using API and enable admin  commands
+        cy.apiInstallPluginFromUrl(
+            `https://github.com/mattermost/mattermost-plugin-autolink/releases/download/v1.2.0/mattermost-autolink-1.2.0.tar.gz`,
+            true,
+        );
+    });
+
+    beforeEach(() => {
+        cy.apiAdminLogin();
+    });
+
+    it('Autolink autocomple is working', function () {
+        //Ensure autilink slash commands are ebabeled
+        cy.get('#post_textbox').clear();
+        cy.get('#post_textbox').type('/a');
+        cy.contains('autolink [command]');
+        cy.contains('autolink [command]').click();
+    });
+
+    it('Create link', function () {
+        // Add a link
+        cy.get('#post_textbox').clear();
+        cy.get('#post_textbox').type('/a');
+        cy.contains('autolink [command]').click(); // correct locator - waiting on bug fix
+        cy.get('#post_textbox').type(`add ${linkName}`);
+        cy.get('#post_textbox').should('contain', `/autolink add ${linkName}`);
+        cy.get('#post_textbox');
+        cy.wait(250);
+        cy.get('#post_textbox').type('{enter}', {force: true});
+        cy.contains(`: ${linkName}`);
+    });
+
+    it('Add a template', function () {
+        //Add a template
+        cy.get('#post_textbox').clear();
+        cy.get('#post_textbox')
+            .should('be.focused')
+            .type(
+                `/autolink set ${linkName} ` +
+                    'Template [MM-${{}jira_id{}}](https://mattermost.atlassian.net/browse/MM-${{}jira_id{}}){enter}',
+            );
+        cy.contains('Template: ');
+        cy.waitUntil(() => {
+            return cy.getLastPost().then((el) => {
+                return el.find('code');
+            });
+        });
+        cy.wait(250);
+        cy.getLastPost().within(() => {
+            cy.get('code').should(
+                'have.text',
+                '[MM-${jira_id}](https://mattermost.atlassian.net/browse/MM-${jira_id})',
+            );
+        });
+    });
+
+    it('Add a Pattern', function () {
+        // Add a patern
+        cy.get('#post_textbox').clear();
+        cy.get('#post_textbox').type(`/autolink set ${linkName} Pattern (MM)(-)(?P<jira_id>\\d+){enter}`);
+        cy.contains('Pattern: ');
+    });
+
+    it('Pattern is applied', function () {
+        //Pattern is applied
+        cy.get('#post_textbox').clear;
+        cy.postMessage('MM-1234{enter}');
+        cy.getLastPost().within(() => {
+            cy.get('.theme.markdown__link')
+                .should('have.attr', 'href', 'https://mattermost.atlassian.net/browse/MM-1234')
+                .and('have.text', 'MM-1234');
+        });
+    });
+
+    it('Add a Scope', function () {
+        // Add a scope
+        cy.get('#post_textbox').clear();
+        cy.get('#post_textbox').type(`/autolink set ${linkName} Scope ${team1.name}{enter}`);
+        cy.contains('Scope: ');
+        cy.contains(`${team1.name}`);
+    });
+
+    it('Pattern applied in scope only', function () {
+        //pattern applied in Team
+
+        cy.get(`#${team1.name}TeamButton`).click();
+        cy.wait(500);
+        cy.get('#post_textbox').type('MM-1234');
+        cy.wait(1000);
+        cy.get('#post_textbox').type('{enter}');
+        cy.getLastPost().within(() => {
+            cy.get('.theme.markdown__link')
+                .should('have.attr', 'href', 'https://mattermost.atlassian.net/browse/MM-1234')
+                .and('have.text', 'MM-1234');
+        });
+        //pattern NOT applied in Team
+        cy.get(`#${team2.name}TeamButton`).should('have.attr', 'href', `/${team2.name}`).click();
+        cy.get('#post_textbox').should('be.visible').clear(); //.should should resolve need for wait
+        cy.wait(500);
+        cy.postMessage('MM-1234');
+        cy.getLastPost().within(() => {
+            cy.get('p').should('have.text', 'MM-1234');
+        });
+        cy.get(`#${team1.name}TeamButton`).click();
+        cy.get('#post_textbox').should('be.focused');
+    });
+
+    it('Disable link ', function () {
+        //Confirm enabled state
+        cy.get(`#${team1.name}TeamButton`).click();
+        cy.wait(250);
+        cy.postMessage('MM-2222{enter}');
+        cy.getLastPost().within(() => {
+            cy.get('.theme.markdown__link')
+                .should('have.attr', 'href', 'https://mattermost.atlassian.net/browse/MM-2222')
+                .and('have.text', 'MM-2222');
+        });
+        //Disable
+        cy.postMessage(`/autolink disable ${linkName}{enter}`);
+        cy.wait(1500);
+
+        cy.getLastPost().within((el) => {
+            console.log('look here');
+            console.log(el);
+            cy.get('del').should('have.text', linkName);
+        });
+        cy.wait(499);
+        cy.get('#post_textbox').clear();
+        cy.wait(250);
+        cy.get('#post_textbox').type('MM-2222{enter}');
+        cy.getLastPost().within(() => {
+            cy.get('p').should('have.text', 'MM-2222');
+        });
+    });
+
+    it('enable link ', function () {
+        cy.get('#post_textbox').clear();
+        cy.get('#post_textbox').type(`/autolink enable ${linkName}{enter}`);
+        cy.contains(`: ${linkName}`);
+        cy.get('#post_textbox').clear();
+        cy.wait(250);
+        cy.get('#post_textbox').type('MM-2222{enter}');
+        cy.getLastPost().within(() => {
+            cy.get('.theme.markdown__link')
+                .should('have.attr', 'href', 'https://mattermost.atlassian.net/browse/MM-2222')
+                .and('have.text', 'MM-2222');
+        });
+    });
+
+    it('Apply patterns on edit false by default', function () {
+        cy.get('#post_textbox').clear();
+        cy.get('#post_textbox').type('NN-5678{enter}');
+        cy.wait(1000);
+        cy.get('#post_textbox').should('be.focused').type('{uparrow}');
+        cy.wait(250);
+        cy.get('#edit_textbox').should('be.focused').type('{home}{del}{del}MM{enter}');
+        cy.getLastPost().within(() => {
+            cy.get('p').should('have.text', 'MM-5678');
+        });
+    });
+
+    it('Apply patterns on edit true', function () {
+        // Update config
+        cy.apiUpdateConfig({
+            PluginSettings: {
+                PluginStates: {'mattermost-autolink': {Enable: true}},
+                Plugins: {
+                    'mattermost-autolink': {enableadmincommand: true},
+                    'mattermost-autolink': {enableonupdate: true},
+                },
+            },
+        });
+
+        cy.visit(`/${team1.name}/channels/town-square`);
+        
+        //Ensure pattern is applied on edit
+
+        cy.get('#post_textbox').clear();
+        cy.get('#post_textbox').type('NN-5678{enter}');
+        cy.wait(1000);
+        cy.get('#post_textbox').type('{uparrow}');
+        cy.wait(250);
+        cy.get('#edit_textbox').type('{home}{del}{del}MM{enter}');
+        cy.getLastPost().within(() => {
+            cy.get('.theme.markdown__link')
+                .should('have.attr', 'href', 'https://mattermost.atlassian.net/browse/MM-5678')
+                .and('have.text', 'MM-5678');
+        });
+    });
+
+    it('Non sysadmin can not use slash commands', function () {
+        cy.apiLogin(regularUser);
+        cy.visit(`/${team1.name}/channels/town-square`);
+        // Ensure autolink commands are non functinal
+        cy.postMessage('/autolink list {enter}');
+        cy.uiWaitUntilMessagePostedIncludes(` commands can only be executed by a system administrator or `);
+        cy.getLastPost().within(() => {
+            cy.contains(` commands can only be executed by a system administrator or `);
+        });
+        cy.postMessage('/autolink add pickles{enter}');
+        cy.wait(1000);
+        cy.uiWaitUntilMessagePostedIncludes(` commands can only be executed by a system administrator or `);
+                cy.getLastPost().within(() => {
+            cy.contains(` commands can only be executed by a system administrator or `);
+        });
+    });
+
+    it('User added as plugin admin', function () {
+        cy.apiUpdateConfig({
+            PluginSettings: {
+                PluginStates: {'mattermost-autolink': {Enable: true}},
+                Plugins: {
+                    'mattermost-autolink': {enableadmincommand: true},
+                    'mattermost-autolink': {enableonupdate: true},
+                    'mattermost-autolink': {pluginadmins: regularUser.id},
+                },
+            },
+        });
+        cy.apiLogin(regularUser);
+        cy.visit(`/${team1.name}/channels/town-square`);
+
+        cy.get('#post_textbox').should('be.visible');
+        cy.wait(250);
+        cy.postMessage('/autolink list {enter}');
+        cy.postMessage('{enter}');
+        cy.get('#post_textbox').should('be.visible');
+        cy.getLastPost().within(() => {
+            cy.contains(`: ${linkName}`);
+        });
+        cy.postMessage(`/autolink disable ${linkName}{enter}`);
+        cy.wait(1500);
+
+        cy.getLastPost().within((el) => {
+            console.log('look here');
+            console.log(el);
+            cy.get('del').should('have.text', linkName);
+        });
+    });
+
+    it('Common links work', function () {
+        //ESR Link
+        let esrLinkName = `ESR${getRandomId()}`;
+        cy.postMessage(`/autolink add ${esrLinkName}`);
+        cy.postMessage(`/autolink set ${esrLinkName} Pattern ESR`);
+        cy.postMessage(
+            `/autolink set ${esrLinkName} Template [ESR](https://docs.mattermost.com/prcess/traing.html#rhs)`,
+        );
+        cy.postMessage(`A post with ESR link?`);
+        cy.getLastPost().within(() => {
+            cy.get('.theme.markdown__link')
+                .should('have.attr', 'href', 'https://docs.mattermost.com/prcess/traing.html#rhs')
+                .and('have.text', 'ESR');
+        });
+        //GitHub Link
+        let gitLinkName = `GitHub${getRandomId()}`;
+        cy.postMessage(`/autolink add ${gitLinkName}`);
+        cy.postMessage(
+            `/autolink set ${gitLinkName} ` + 'Pattern https://github\\.com/mattermost/(?P<repo>.+)/pull/(?P<id>\\d+)',
+        );
+        cy.postMessage(
+            `/autolink set ${gitLinkName} ` +
+                'Template [pr-${{}repo{}}-${{}id{}}](https://github.com/mattermost/${{}repo{}}/pull/${{}id{}})',
+        );
+        cy.postMessage(`https://github.com/mattermost/mattermost-server/pull/14756`);
+        cy.getLastPost().within(() => {
+            cy.get('.theme.markdown__link')
+                .should('have.attr', 'href', 'https://github.com/mattermost/mattermost-server/pull/14756')
+                .and('have.text', 'pr-mattermost-server-14756');
+        });
+    });
+
+    it('Mutiple GitHub links', function () {
+        cy.postMessage(
+            'https://github.com/mattermost/mattermost-webapp/pull/2859 and https://github.com/mattermost/mattermost-webapp/pull/2858',
+        );
+        cy.getLastPost().within(() => {
+            cy.get('.theme.markdown__link')
+                .eq(0)
+                .should('have.attr', 'href', 'https://github.com/mattermost/mattermost-webapp/pull/2859')
+                .and('have.text', 'pr-mattermost-webapp-2859');
+        });
+        cy.getLastPost().within(() => {
+            cy.get('.theme.markdown__link')
+                .eq(1)
+                .should('have.attr', 'href', 'https://github.com/mattermost/mattermost-webapp/pull/2858')
+                .and('have.text', 'pr-mattermost-webapp-2858'); 
+        });
+    });
+
+});