diff --git a/ui/packages/consul-ui/app/components/child-selector/index.hbs b/ui/packages/consul-ui/app/components/child-selector/index.hbs
index 1b13235f0..f2da698ee 100644
--- a/ui/packages/consul-ui/app/components/child-selector/index.hbs
+++ b/ui/packages/consul-ui/app/components/child-selector/index.hbs
@@ -1,4 +1,6 @@
-<div ...attributes>
+<div
+  ...attributes
+>
 {{yield}}
   <YieldSlot @name="create">{{yield}}</YieldSlot>
   <label class="type-text">
diff --git a/ui/packages/consul-ui/app/components/child-selector/index.js b/ui/packages/consul-ui/app/components/child-selector/index.js
index 54f1837c2..9ebd5aac7 100644
--- a/ui/packages/consul-ui/app/components/child-selector/index.js
+++ b/ui/packages/consul-ui/app/components/child-selector/index.js
@@ -3,6 +3,8 @@ import { get, set, computed } from '@ember/object';
 import { alias } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 
+import { task } from 'ember-concurrency';
+
 import Slotted from 'block-slots';
 
 export default Component.extend(Slotted, {
@@ -43,6 +45,25 @@ export default Component.extend(Slotted, {
     }
     return options;
   }),
+  save: task(function*(item, items, success = function() {}) {
+    const repo = this.repo;
+    try {
+      item = yield repo.persist(item);
+      this.actions.change.apply(this, [
+        {
+          target: {
+            name: 'items[]',
+            value: items,
+          },
+        },
+        items,
+        item,
+      ]);
+      success();
+    } catch (e) {
+      this.error({ error: e });
+    }
+  }),
   actions: {
     search: function(term) {
       // TODO: make sure we can either search before things are loaded
@@ -60,37 +81,7 @@ export default Component.extend(Slotted, {
     reset: function() {
       this.form.clear({ Datacenter: this.dc, Namespace: this.nspace });
     },
-    save: function(item, items, success = function() {}) {
-      // Specifically this saves an 'new' option/child
-      // and then adds it to the selectedOptions, not options
-      const repo = this.repo;
-      set(item, 'CreateTime', new Date().getTime());
-      // TODO: temporary async
-      // this should be `set(this, 'item', repo.persist(item));`
-      // need to be sure that its saved before adding/closing the modal for now
-      // and we don't open the modal on prop change yet
-      item = repo.persist(item);
-      this._listeners.add(item, {
-        message: e => {
-          this.actions.change.apply(this, [
-            {
-              target: {
-                name: 'items[]',
-                value: items,
-              },
-            },
-            items,
-            e.data,
-          ]);
-          item.willDestroy();
-          success();
-        },
-        error: e => {
-          item.willDestroy();
-          this.error(e);
-        },
-      });
-    },
+
     remove: function(item, items) {
       const prop = this.repo.getSlugKey();
       const value = get(item, prop);
diff --git a/ui/packages/consul-ui/app/components/policy-selector/index.hbs b/ui/packages/consul-ui/app/components/policy-selector/index.hbs
index 270e89f33..8516d3bd8 100644
--- a/ui/packages/consul-ui/app/components/policy-selector/index.hbs
+++ b/ui/packages/consul-ui/app/components/policy-selector/index.hbs
@@ -24,7 +24,10 @@
           <PolicyForm @form={{form}} @nspace={{nspace}} @dc={{dc}} @allowServiceIdentity={{allowServiceIdentity}} />
         </BlockSlot>
         <BlockSlot @name="actions" as |close|>
-          <button type="submit" {{action 'save' item items (queue (action close) (action 'reset'))}} disabled={{if (or item.isSaving item.isPristine item.isInvalid) 'disabled'}}>
+          <button type="submit"
+            onclick={{perform this.save item items (queue (action close) (action 'reset'))}}
+            disabled={{if (or item.isSaving item.isPristine item.isInvalid) 'disabled'}}
+          >
             {{#if item.isSaving }}
               <div class="progress indeterminate"></div>
             {{/if}}
diff --git a/ui/packages/consul-ui/app/components/policy-selector/index.js b/ui/packages/consul-ui/app/components/policy-selector/index.js
index bedb19b9f..2c20eb1d9 100644
--- a/ui/packages/consul-ui/app/components/policy-selector/index.js
+++ b/ui/packages/consul-ui/app/components/policy-selector/index.js
@@ -7,7 +7,7 @@ const ERROR_INVALID_POLICY = 'Invalid service policy';
 const ERROR_NAME_EXISTS = 'Invalid Policy: A Policy with Name';
 
 export default ChildSelectorComponent.extend({
-  repo: service('repository/policy/component'),
+  repo: service('repository/policy'),
   name: 'policy',
   type: 'policy',
   allowIdentity: true,
@@ -16,9 +16,10 @@ export default ChildSelectorComponent.extend({
     this._super(...arguments);
     const source = this.source;
     if (source) {
-      const event = 'save';
       this._listeners.add(source, {
-        save: e => this.actions[event].bind(this)(...e.data),
+        save: e => {
+          this.save.perform(...e.data);
+        },
       });
     }
   },
diff --git a/ui/packages/consul-ui/app/components/role-selector/index.hbs b/ui/packages/consul-ui/app/components/role-selector/index.hbs
index 7f366f968..e1c78bd87 100644
--- a/ui/packages/consul-ui/app/components/role-selector/index.hbs
+++ b/ui/packages/consul-ui/app/components/role-selector/index.hbs
@@ -35,7 +35,10 @@
   <BlockSlot @name="actions" as |close|>
 
 {{#if (eq state 'role')}}
-    <button type="submit" {{action 'save' item items (queue (action close) (action 'reset'))}} disabled={{if (or item.isSaving item.isPristine item.isInvalid) 'disabled'}}>
+    <button type="submit"
+      onclick={{perform this.save item items (queue (action close) (action 'reset'))}}
+      disabled={{if (or item.isSaving item.isPristine item.isInvalid) 'disabled'}}
+    >
       {{#if item.isSaving }}
         <div class="progress indeterminate"></div>
       {{/if}}
diff --git a/ui/packages/consul-ui/app/components/role-selector/index.js b/ui/packages/consul-ui/app/components/role-selector/index.js
index 05a024453..07cc6d7b7 100644
--- a/ui/packages/consul-ui/app/components/role-selector/index.js
+++ b/ui/packages/consul-ui/app/components/role-selector/index.js
@@ -6,7 +6,7 @@ import { alias } from '@ember/object/computed';
 import { CallableEventSource as EventSource } from 'consul-ui/utils/dom/event-source';
 
 export default ChildSelectorComponent.extend({
-  repo: service('repository/role/component'),
+  repo: service('repository/role'),
   dom: service('dom'),
   name: 'role',
   type: 'role',
diff --git a/ui/packages/consul-ui/app/controllers/application.js b/ui/packages/consul-ui/app/controllers/application.js
index 84baceed9..e192b4dda 100644
--- a/ui/packages/consul-ui/app/controllers/application.js
+++ b/ui/packages/consul-ui/app/controllers/application.js
@@ -1,77 +1,82 @@
-import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
 import { getOwner } from '@ember/application';
-import { get } from '@ember/object';
+import { get, action } from '@ember/object';
 import transitionable from 'consul-ui/utils/routing/transitionable';
 
-export default Controller.extend({
-  router: service('router'),
-  store: service('store'),
-  feedback: service('feedback'),
-  actions: {
-    // TODO: We currently do this in the controller instead of the router
-    // as the nspace and dc variables aren't available directly on the Route
-    // look to see if we can move this up there so we can empty the Controller
-    // out again
-    reauthorize: function(e) {
-      // TODO: For the moment e isn't a real event
-      // it has data which is potentially the token
-      // and type which is the logout/authorize/use action
-      // used for the feedback service.
-      this.feedback.execute(
-        () => {
-          // TODO: Currently we clear cache from the ember-data store
-          // ideally this would be a static method of the abstract Repository class
-          // once we move to proper classes for services take another look at this.
-          this.store.clear();
-          //
-          const params = {};
-          if (e.data) {
-            const token = e.data;
-            // TODO: Do I actually need to check to see if nspaces are enabled here?
-            if (typeof this.nspace !== 'undefined') {
-              const nspace = get(token, 'Namespace') || this.nspace.Name;
-              // you potentially have a new namespace
-              // if you do redirect to it
-              if (nspace !== this.nspace.Name) {
-                params.nspace = `~${nspace}`;
-              }
+export default class ApplicationController extends Controller {
+  @service('router')
+  router;
+
+  @service('store')
+  store;
+
+  @service('feedback')
+  feedback;
+
+  // TODO: We currently do this in the controller instead of the router
+  // as the nspace and dc variables aren't available directly on the Route
+  // look to see if we can move this up there so we can empty the Controller
+  // out again
+  @action
+  reauthorize(e) {
+    // TODO: For the moment e isn't a real event
+    // it has data which is potentially the token
+    // and type which is the logout/authorize/use action
+    // used for the feedback service.
+    this.feedback.execute(
+      () => {
+        // TODO: Currently we clear cache from the ember-data store
+        // ideally this would be a static method of the abstract Repository class
+        // once we move to proper classes for services take another look at this.
+        this.store.clear();
+        //
+        const params = {};
+        if (e.data) {
+          const token = e.data;
+          // TODO: Do I actually need to check to see if nspaces are enabled here?
+          if (typeof this.nspace !== 'undefined') {
+            const nspace = get(token, 'Namespace') || this.nspace.Name;
+            // you potentially have a new namespace
+            // if you do redirect to it
+            if (nspace !== this.nspace.Name) {
+              params.nspace = `~${nspace}`;
             }
           }
-          const container = getOwner(this);
-          const routeName = this.router.currentRoute.name;
-          const route = container.lookup(`route:${routeName}`);
-          // Refresh the application route as everything including the main nav needs refreshing
-          return container
-            .lookup('route:application')
-            .refresh()
-            .promise.catch(function(e) {
-              // passthrough
-              // if you are on an error page a refresh of the application route will reject
-              // thats ok as we then transition to the actual route you were trying
-              // to get to originally anyway
-            })
-            .then(res => {
-              // Use transitionable if we need to change a section of the URL
-              // or routeName and currentRouteName aren't equal (i.e. error page)
-              if (
-                routeName !== this.router.currentRouteName ||
-                typeof params.nspace !== 'undefined'
-              ) {
-                return route.transitionTo(
-                  ...transitionable(this.router.currentRoute, params, container)
-                );
-              } else {
-                return res;
-              }
-            });
-        },
-        e.type,
-        function(type, e) {
-          return type;
-        },
-        {}
-      );
-    },
-  },
-});
+        }
+        const container = getOwner(this);
+        const routeName = this.router.currentRoute.name;
+        const route = container.lookup(`route:${routeName}`);
+        // Refresh the application route as everything including the main nav needs refreshing
+        return container
+          .lookup('route:application')
+          .refresh()
+          .promise.catch(function(e) {
+            // passthrough
+            // if you are on an error page a refresh of the application route will reject
+            // thats ok as we then transition to the actual route you were trying
+            // to get to originally anyway
+          })
+          .then(res => {
+            // Use transitionable if we need to change a section of the URL
+            // or routeName and currentRouteName aren't equal (i.e. error page)
+            if (
+              routeName !== this.router.currentRouteName ||
+              typeof params.nspace !== 'undefined'
+            ) {
+              return route.transitionTo(
+                ...transitionable(this.router.currentRoute, params, container)
+              );
+            } else {
+              return res;
+            }
+          });
+      },
+      e.type,
+      function(type, e) {
+        return type;
+      },
+      {}
+    );
+  }
+}
diff --git a/ui/packages/consul-ui/app/controllers/dc.js b/ui/packages/consul-ui/app/controllers/dc.js
index 75ceaaec3..7abcab1c7 100644
--- a/ui/packages/consul-ui/app/controllers/dc.js
+++ b/ui/packages/consul-ui/app/controllers/dc.js
@@ -1,3 +1,3 @@
 import Controller from '@ember/controller';
 
-export default Controller.extend({});
+export default class DcController extends Controller {}
diff --git a/ui/packages/consul-ui/app/controllers/dc/acls/create.js b/ui/packages/consul-ui/app/controllers/dc/acls/create.js
index 4723e0ce4..f4c701cbb 100644
--- a/ui/packages/consul-ui/app/controllers/dc/acls/create.js
+++ b/ui/packages/consul-ui/app/controllers/dc/acls/create.js
@@ -1,2 +1,2 @@
 import Controller from './edit';
-export default Controller.extend();
+export default class CreateController extends Controller {}
diff --git a/ui/packages/consul-ui/app/controllers/dc/acls/index.js b/ui/packages/consul-ui/app/controllers/dc/acls/index.js
index 7d4014f08..71d59e974 100644
--- a/ui/packages/consul-ui/app/controllers/dc/acls/index.js
+++ b/ui/packages/consul-ui/app/controllers/dc/acls/index.js
@@ -1,6 +1,7 @@
+import { action } from '@ember/object';
 import Controller from '@ember/controller';
-export default Controller.extend({
-  queryParams: {
+export default class IndexController extends Controller {
+  queryParams = {
     filterBy: {
       as: 'type',
     },
@@ -8,10 +9,10 @@ export default Controller.extend({
       as: 'filter',
       replace: true,
     },
-  },
-  actions: {
-    sendClone: function(item) {
-      this.send('clone', item);
-    },
-  },
-});
+  };
+
+  @action
+  sendClone(item) {
+    this.send('clone', item);
+  }
+}
diff --git a/ui/packages/consul-ui/app/controllers/dc/acls/policies/create.js b/ui/packages/consul-ui/app/controllers/dc/acls/policies/create.js
index 4723e0ce4..f4c701cbb 100644
--- a/ui/packages/consul-ui/app/controllers/dc/acls/policies/create.js
+++ b/ui/packages/consul-ui/app/controllers/dc/acls/policies/create.js
@@ -1,2 +1,2 @@
 import Controller from './edit';
-export default Controller.extend();
+export default class CreateController extends Controller {}
diff --git a/ui/packages/consul-ui/app/controllers/dc/acls/policies/edit.js b/ui/packages/consul-ui/app/controllers/dc/acls/policies/edit.js
index 70dd907c9..6288962de 100644
--- a/ui/packages/consul-ui/app/controllers/dc/acls/policies/edit.js
+++ b/ui/packages/consul-ui/app/controllers/dc/acls/policies/edit.js
@@ -1,14 +1,17 @@
-import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
-export default Controller.extend({
-  builder: service('form'),
-  init: function() {
-    this._super(...arguments);
+import Controller from '@ember/controller';
+export default class EditController extends Controller {
+  @service('form')
+  builder;
+
+  init() {
+    super.init(...arguments);
     this.form = this.builder.form('policy');
-  },
-  setProperties: function(model) {
+  }
+
+  setProperties(model) {
     // essentially this replaces the data with changesets
-    this._super(
+    super.setProperties(
       Object.keys(model).reduce((prev, key, i) => {
         switch (key) {
           case 'item':
@@ -18,5 +21,5 @@ export default Controller.extend({
         return prev;
       }, model)
     );
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/controllers/dc/acls/policies/index.js b/ui/packages/consul-ui/app/controllers/dc/acls/policies/index.js
index 54f6cac2d..7bdef4201 100644
--- a/ui/packages/consul-ui/app/controllers/dc/acls/policies/index.js
+++ b/ui/packages/consul-ui/app/controllers/dc/acls/policies/index.js
@@ -1,6 +1,6 @@
 import Controller from '@ember/controller';
-export default Controller.extend({
-  queryParams: {
+export default class IndexController extends Controller {
+  queryParams = {
     sortBy: 'sort',
     dc: 'dc',
     type: 'type',
@@ -8,5 +8,5 @@ export default Controller.extend({
       as: 'filter',
       replace: true,
     },
-  },
-});
+  };
+}
diff --git a/ui/packages/consul-ui/app/controllers/dc/acls/roles/create.js b/ui/packages/consul-ui/app/controllers/dc/acls/roles/create.js
index 4723e0ce4..f4c701cbb 100644
--- a/ui/packages/consul-ui/app/controllers/dc/acls/roles/create.js
+++ b/ui/packages/consul-ui/app/controllers/dc/acls/roles/create.js
@@ -1,2 +1,2 @@
 import Controller from './edit';
-export default Controller.extend();
+export default class CreateController extends Controller {}
diff --git a/ui/packages/consul-ui/app/controllers/dc/acls/roles/edit.js b/ui/packages/consul-ui/app/controllers/dc/acls/roles/edit.js
index c50e088fb..17d870ddc 100644
--- a/ui/packages/consul-ui/app/controllers/dc/acls/roles/edit.js
+++ b/ui/packages/consul-ui/app/controllers/dc/acls/roles/edit.js
@@ -1,14 +1,17 @@
-import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
-export default Controller.extend({
-  builder: service('form'),
-  init: function() {
-    this._super(...arguments);
+import Controller from '@ember/controller';
+export default class EditController extends Controller {
+  @service('form')
+  builder;
+
+  init() {
+    super.init(...arguments);
     this.form = this.builder.form('role');
-  },
-  setProperties: function(model) {
+  }
+
+  setProperties(model) {
     // essentially this replaces the data with changesets
-    this._super(
+    super.setProperties(
       Object.keys(model).reduce((prev, key, i) => {
         switch (key) {
           case 'item':
@@ -18,5 +21,5 @@ export default Controller.extend({
         return prev;
       }, model)
     );
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/controllers/dc/acls/roles/index.js b/ui/packages/consul-ui/app/controllers/dc/acls/roles/index.js
index f99cde37f..9913cb826 100644
--- a/ui/packages/consul-ui/app/controllers/dc/acls/roles/index.js
+++ b/ui/packages/consul-ui/app/controllers/dc/acls/roles/index.js
@@ -1,10 +1,10 @@
 import Controller from '@ember/controller';
-export default Controller.extend({
-  queryParams: {
+export default class IndexController extends Controller {
+  queryParams = {
     sortBy: 'sort',
     search: {
       as: 'filter',
       replace: true,
     },
-  },
-});
+  };
+}
diff --git a/ui/packages/consul-ui/app/controllers/dc/acls/tokens/create.js b/ui/packages/consul-ui/app/controllers/dc/acls/tokens/create.js
index 4723e0ce4..f4c701cbb 100644
--- a/ui/packages/consul-ui/app/controllers/dc/acls/tokens/create.js
+++ b/ui/packages/consul-ui/app/controllers/dc/acls/tokens/create.js
@@ -1,2 +1,2 @@
 import Controller from './edit';
-export default Controller.extend();
+export default class CreateController extends Controller {}
diff --git a/ui/packages/consul-ui/app/controllers/dc/acls/tokens/index.js b/ui/packages/consul-ui/app/controllers/dc/acls/tokens/index.js
index f99cde37f..9913cb826 100644
--- a/ui/packages/consul-ui/app/controllers/dc/acls/tokens/index.js
+++ b/ui/packages/consul-ui/app/controllers/dc/acls/tokens/index.js
@@ -1,10 +1,10 @@
 import Controller from '@ember/controller';
-export default Controller.extend({
-  queryParams: {
+export default class IndexController extends Controller {
+  queryParams = {
     sortBy: 'sort',
     search: {
       as: 'filter',
       replace: true,
     },
-  },
-});
+  };
+}
diff --git a/ui/packages/consul-ui/app/controllers/dc/intentions/index.js b/ui/packages/consul-ui/app/controllers/dc/intentions/index.js
index c22bc54ce..bdee37254 100644
--- a/ui/packages/consul-ui/app/controllers/dc/intentions/index.js
+++ b/ui/packages/consul-ui/app/controllers/dc/intentions/index.js
@@ -1,12 +1,12 @@
 import Controller from '@ember/controller';
 
-export default Controller.extend({
-  queryParams: {
+export default class IndexController extends Controller {
+  queryParams = {
     sortBy: 'sort',
     access: 'access',
     search: {
       as: 'filter',
       replace: true,
     },
-  },
-});
+  };
+}
diff --git a/ui/packages/consul-ui/app/controllers/dc/kv/index.js b/ui/packages/consul-ui/app/controllers/dc/kv/index.js
index 510563886..75478cd61 100644
--- a/ui/packages/consul-ui/app/controllers/dc/kv/index.js
+++ b/ui/packages/consul-ui/app/controllers/dc/kv/index.js
@@ -1,9 +1,9 @@
 import Controller from '@ember/controller';
-export default Controller.extend({
-  queryParams: {
+export default class IndexController extends Controller {
+  queryParams = {
     search: {
       as: 'filter',
       replace: true,
     },
-  },
-});
+  };
+}
diff --git a/ui/packages/consul-ui/app/controllers/dc/nodes/index.js b/ui/packages/consul-ui/app/controllers/dc/nodes/index.js
index b3f36efae..8fffd8d19 100644
--- a/ui/packages/consul-ui/app/controllers/dc/nodes/index.js
+++ b/ui/packages/consul-ui/app/controllers/dc/nodes/index.js
@@ -1,12 +1,12 @@
 import Controller from '@ember/controller';
 
-export default Controller.extend({
-  queryParams: {
+export default class IndexController extends Controller {
+  queryParams = {
     sortBy: 'sort',
     status: 'status',
     search: {
       as: 'filter',
       replace: true,
     },
-  },
-});
+  };
+}
diff --git a/ui/packages/consul-ui/app/controllers/dc/nodes/show/services.js b/ui/packages/consul-ui/app/controllers/dc/nodes/show/services.js
index c9199c3b4..0fb98b410 100644
--- a/ui/packages/consul-ui/app/controllers/dc/nodes/show/services.js
+++ b/ui/packages/consul-ui/app/controllers/dc/nodes/show/services.js
@@ -1,14 +1,16 @@
 import Controller from '@ember/controller';
 import { get, computed } from '@ember/object';
 
-export default Controller.extend({
-  queryParams: {
+export default class ServicesController extends Controller {
+  queryParams = {
     search: {
       as: 'filter',
       replace: true,
     },
-  },
-  checks: computed('item.Checks.[]', function() {
+  };
+
+  @computed('item.Checks.[]')
+  get checks() {
     const checks = {};
     get(this, 'item.Checks')
       .filter(item => {
@@ -22,5 +24,5 @@ export default Controller.extend({
       });
 
     return checks;
-  }),
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/controllers/dc/nspaces/create.js b/ui/packages/consul-ui/app/controllers/dc/nspaces/create.js
index 4723e0ce4..f4c701cbb 100644
--- a/ui/packages/consul-ui/app/controllers/dc/nspaces/create.js
+++ b/ui/packages/consul-ui/app/controllers/dc/nspaces/create.js
@@ -1,2 +1,2 @@
 import Controller from './edit';
-export default Controller.extend();
+export default class CreateController extends Controller {}
diff --git a/ui/packages/consul-ui/app/controllers/dc/nspaces/index.js b/ui/packages/consul-ui/app/controllers/dc/nspaces/index.js
index 422233d16..039254995 100644
--- a/ui/packages/consul-ui/app/controllers/dc/nspaces/index.js
+++ b/ui/packages/consul-ui/app/controllers/dc/nspaces/index.js
@@ -1,10 +1,10 @@
 import Controller from '@ember/controller';
 
-export default Controller.extend({
-  queryParams: {
+export default class IndexController extends Controller {
+  queryParams = {
     sortBy: 'sort',
     search: {
       as: 'filter',
     },
-  },
-});
+  };
+}
diff --git a/ui/packages/consul-ui/app/controllers/dc/services/index.js b/ui/packages/consul-ui/app/controllers/dc/services/index.js
index ad77eb593..aec83dc46 100644
--- a/ui/packages/consul-ui/app/controllers/dc/services/index.js
+++ b/ui/packages/consul-ui/app/controllers/dc/services/index.js
@@ -1,8 +1,8 @@
-import Controller from '@ember/controller';
 import { computed } from '@ember/object';
+import Controller from '@ember/controller';
 
-export default Controller.extend({
-  queryParams: {
+export default class IndexController extends Controller {
+  queryParams = {
     sortBy: 'sort',
     status: 'status',
     source: 'source',
@@ -10,17 +10,21 @@ export default Controller.extend({
     search: {
       as: 'filter',
     },
-  },
-  services: computed('items.[]', function() {
+  };
+
+  @computed('items.[]')
+  get services() {
     return this.items.filter(function(item) {
       return item.Kind !== 'connect-proxy';
     });
-  }),
-  externalSources: computed('services', function() {
+  }
+
+  @computed('services')
+  get externalSources() {
     const sources = this.services.reduce(function(prev, item) {
       return prev.concat(item.ExternalSources || []);
     }, []);
     // unique, non-empty values, alpha sort
     return [...new Set(sources)].filter(Boolean).sort();
-  }),
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/controllers/dc/services/instance.js b/ui/packages/consul-ui/app/controllers/dc/services/instance.js
index f98b6c0fc..8030ab37e 100644
--- a/ui/packages/consul-ui/app/controllers/dc/services/instance.js
+++ b/ui/packages/consul-ui/app/controllers/dc/services/instance.js
@@ -1,27 +1,28 @@
-import Controller from '@ember/controller';
-import { get } from '@ember/object';
 import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
+import { get, action } from '@ember/object';
 
-export default Controller.extend({
-  notify: service('flashMessages'),
-  actions: {
-    error: function(e) {
-      if (e.target.readyState === 1) {
-        // OPEN
-        if (get(e, 'error.errors.firstObject.status') === '404') {
-          this.notify.add({
-            destroyOnClick: false,
-            sticky: true,
-            type: 'warning',
-            action: 'update',
-          });
-          [e.target, this.proxy].forEach(function(item) {
-            if (item && typeof item.close === 'function') {
-              item.close();
-            }
-          });
-        }
+export default class InstanceController extends Controller {
+  @service('flashMessages')
+  notify;
+
+  @action
+  error(e) {
+    if (e.target.readyState === 1) {
+      // OPEN
+      if (get(e, 'error.errors.firstObject.status') === '404') {
+        this.notify.add({
+          destroyOnClick: false,
+          sticky: true,
+          type: 'warning',
+          action: 'update',
+        });
+        [e.target, this.proxy].forEach(function(item) {
+          if (item && typeof item.close === 'function') {
+            item.close();
+          }
+        });
       }
-    },
-  },
-});
+    }
+  }
+}
diff --git a/ui/packages/consul-ui/app/controllers/dc/services/show.js b/ui/packages/consul-ui/app/controllers/dc/services/show.js
index 0cc9c8431..e715f0de6 100644
--- a/ui/packages/consul-ui/app/controllers/dc/services/show.js
+++ b/ui/packages/consul-ui/app/controllers/dc/services/show.js
@@ -1,36 +1,41 @@
-import Controller from '@ember/controller';
-import { get } from '@ember/object';
-import { alias } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
-export default Controller.extend({
-  dom: service('dom'),
-  notify: service('flashMessages'),
-  item: alias('items.firstObject'),
-  actions: {
-    error: function(e) {
-      if (e.target.readyState === 1) {
-        // OPEN
-        if (get(e, 'error.errors.firstObject.status') === '404') {
-          this.notify.add({
-            destroyOnClick: false,
-            sticky: true,
-            type: 'warning',
-            action: 'update',
-          });
-        }
-        [
-          e.target,
-          this.intentions,
-          this.chain,
-          this.proxies,
-          this.gatewayServices,
-          this.topology,
-        ].forEach(function(item) {
-          if (item && typeof item.close === 'function') {
-            item.close();
-          }
+import { alias } from '@ember/object/computed';
+import Controller from '@ember/controller';
+import { get, action } from '@ember/object';
+export default class ShowController extends Controller {
+  @service('dom')
+  dom;
+
+  @service('flashMessages')
+  notify;
+
+  @alias('items.firstObject')
+  item;
+
+  @action
+  error(e) {
+    if (e.target.readyState === 1) {
+      // OPEN
+      if (get(e, 'error.errors.firstObject.status') === '404') {
+        this.notify.add({
+          destroyOnClick: false,
+          sticky: true,
+          type: 'warning',
+          action: 'update',
         });
       }
-    },
-  },
-});
+      [
+        e.target,
+        this.intentions,
+        this.chain,
+        this.proxies,
+        this.gatewayServices,
+        this.topology,
+      ].forEach(function(item) {
+        if (item && typeof item.close === 'function') {
+          item.close();
+        }
+      });
+    }
+  }
+}
diff --git a/ui/packages/consul-ui/app/controllers/dc/services/show/instances.js b/ui/packages/consul-ui/app/controllers/dc/services/show/instances.js
index d8a4846dc..183b8b72d 100644
--- a/ui/packages/consul-ui/app/controllers/dc/services/show/instances.js
+++ b/ui/packages/consul-ui/app/controllers/dc/services/show/instances.js
@@ -1,8 +1,8 @@
-import Controller from '@ember/controller';
 import { computed } from '@ember/object';
+import Controller from '@ember/controller';
 
-export default Controller.extend({
-  queryParams: {
+export default class InstancesController extends Controller {
+  queryParams = {
     sortBy: 'sort',
     status: 'status',
     source: 'source',
@@ -10,12 +10,14 @@ export default Controller.extend({
       as: 'filter',
       replace: true,
     },
-  },
-  externalSources: computed('items', function() {
+  };
+
+  @computed('items')
+  get externalSources() {
     const sources = this.items.reduce(function(prev, item) {
       return prev.concat(item.ExternalSources || []);
     }, []);
     // unique, non-empty values, alpha sort
     return [...new Set(sources)].filter(Boolean).sort();
-  }),
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/controllers/dc/services/show/intentions/index.js b/ui/packages/consul-ui/app/controllers/dc/services/show/intentions/index.js
index f99cde37f..9913cb826 100644
--- a/ui/packages/consul-ui/app/controllers/dc/services/show/intentions/index.js
+++ b/ui/packages/consul-ui/app/controllers/dc/services/show/intentions/index.js
@@ -1,10 +1,10 @@
 import Controller from '@ember/controller';
-export default Controller.extend({
-  queryParams: {
+export default class IndexController extends Controller {
+  queryParams = {
     sortBy: 'sort',
     search: {
       as: 'filter',
       replace: true,
     },
-  },
-});
+  };
+}
diff --git a/ui/packages/consul-ui/app/controllers/dc/services/show/services.js b/ui/packages/consul-ui/app/controllers/dc/services/show/services.js
index b71de3054..b06b46320 100644
--- a/ui/packages/consul-ui/app/controllers/dc/services/show/services.js
+++ b/ui/packages/consul-ui/app/controllers/dc/services/show/services.js
@@ -1,12 +1,12 @@
 import Controller from '@ember/controller';
 
-export default Controller.extend({
-  queryParams: {
+export default class ServicesController extends Controller {
+  queryParams = {
     sortBy: 'sort',
     instance: 'instance',
     search: {
       as: 'filter',
       replace: true,
     },
-  },
-});
+  };
+}
diff --git a/ui/packages/consul-ui/app/controllers/dc/services/show/upstreams.js b/ui/packages/consul-ui/app/controllers/dc/services/show/upstreams.js
index b71de3054..9dcd36b7d 100644
--- a/ui/packages/consul-ui/app/controllers/dc/services/show/upstreams.js
+++ b/ui/packages/consul-ui/app/controllers/dc/services/show/upstreams.js
@@ -1,12 +1,12 @@
 import Controller from '@ember/controller';
 
-export default Controller.extend({
-  queryParams: {
+export default class UpstreamsController extends Controller {
+  queryParams = {
     sortBy: 'sort',
     instance: 'instance',
     search: {
       as: 'filter',
       replace: true,
     },
-  },
-});
+  };
+}
diff --git a/ui/packages/consul-ui/app/instance-initializers/event-source.js b/ui/packages/consul-ui/app/instance-initializers/event-source.js
deleted file mode 100644
index dfbafd07a..000000000
--- a/ui/packages/consul-ui/app/instance-initializers/event-source.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import { env } from 'consul-ui/env';
-
-export function initialize(container) {
-  if (env('CONSUL_UI_DISABLE_REALTIME')) {
-    return;
-  }
-  []
-    .concat(
-      ['policy', 'role'].map(function(item) {
-        // create repositories that return a promise resolving to an EventSource
-        return {
-          service: `repository/${item}/component`,
-          extend: 'repository/type/component',
-          // Inject our original respository that is used by this class
-          // within the callable of the EventSource
-          services: {
-            content: `repository/${item}`,
-          },
-        };
-      })
-    )
-    .concat([
-      {
-        service: 'form',
-        services: {
-          role: 'repository/role/component',
-          policy: 'repository/policy/component',
-        },
-      },
-    ])
-    .forEach(function(definition) {
-      if (typeof definition.extend !== 'undefined') {
-        // Create the class instances that we need
-        container.register(
-          `service:${definition.service}`,
-          container.resolveRegistration(`service:${definition.extend}`).extend({})
-        );
-      }
-      Object.keys(definition.services).forEach(function(name) {
-        const servicePath = definition.services[name];
-        // inject its dependencies, this could probably detect the type
-        // but hardcode this for the moment
-        if (typeof definition.route !== 'undefined') {
-          container.inject(`route:${definition.route}`, name, `service:${servicePath}`);
-        } else {
-          container.inject(`service:${definition.service}`, name, `service:${servicePath}`);
-        }
-      });
-    });
-}
-
-export default {
-  initialize,
-};
diff --git a/ui/packages/consul-ui/app/models/policy.js b/ui/packages/consul-ui/app/models/policy.js
index b4c2661b6..d0dec1432 100644
--- a/ui/packages/consul-ui/app/models/policy.js
+++ b/ui/packages/consul-ui/app/models/policy.js
@@ -20,7 +20,11 @@ export default Model.extend({
     defaultValue: '',
   }),
   // frontend only for ordering where CreateIndex can't be used
-  CreateTime: attr('date', { defaultValue: 0 }),
+  CreateTime: attr('number', {
+    defaultValue: function() {
+      return new Date().getTime();
+    },
+  }),
   //
   isGlobalManagement: computed('ID', function() {
     return this.ID === MANAGEMENT_ID;
diff --git a/ui/packages/consul-ui/app/routes/dc.js b/ui/packages/consul-ui/app/routes/dc.js
index 245ee68ba..090a29168 100644
--- a/ui/packages/consul-ui/app/routes/dc.js
+++ b/ui/packages/consul-ui/app/routes/dc.js
@@ -1,7 +1,7 @@
-import Route from 'consul-ui/routing/route';
 import { inject as service } from '@ember/service';
+import Route from 'consul-ui/routing/route';
 import { hash, Promise } from 'rsvp';
-import { get } from '@ember/object';
+import { get, action } from '@ember/object';
 
 // TODO: We should potentially move all these nspace related things
 // up a level to application.js
@@ -23,11 +23,17 @@ const findActiveNspace = function(nspaces, nspace) {
   }
   return found;
 };
-export default Route.extend({
-  repo: service('repository/dc'),
-  nspacesRepo: service('repository/nspace/disabled'),
-  settingsRepo: service('settings'),
-  model: function(params) {
+export default class DcRoute extends Route {
+  @service('repository/dc')
+  repo;
+
+  @service('repository/nspace/disabled')
+  nspacesRepo;
+
+  @service('settings')
+  settingsRepo;
+
+  model(params) {
     const app = this.modelFor('application');
     return hash({
       nspace: this.nspacesRepo.getActive(),
@@ -61,44 +67,45 @@ export default Route.extend({
           return model;
         }
       });
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     // the model here is actually required for the entire application
     // but we need to wait until we are in this route so we know what the dc
     // and or nspace is if the below changes please revists the comments
     // in routes/application:model
     this.controllerFor('application').setProperties(model);
-  },
-  actions: {
-    // TODO: This will eventually be deprecated please see
-    // https://deprecations.emberjs.com/v3.x/#toc_deprecate-router-events
-    willTransition: function(transition) {
-      this._super(...arguments);
-      if (
-        typeof transition !== 'undefined' &&
-        (transition.from.name.endsWith('nspaces.create') ||
-          transition.from.name.startsWith('nspace.dc.acls.tokens'))
-      ) {
-        // Only when we create, reload the nspaces in the main menu to update them
-        // as we don't block for those
-        // And also when we [Use] a token reload the nspaces that you are able to see,
-        // including your permissions for being able to manage namespaces
-        // Potentially we should just do this on every single transition
-        // but then we would need to check to see if nspaces are enabled
-        const controller = this.controllerFor('application');
-        Promise.all([
-          this.nspacesRepo.findAll(),
-          this.nspacesRepo.authorize(get(controller, 'dc.Name'), get(controller, 'nspace.Name')),
-        ]).then(([nspaces, permissions]) => {
-          if (typeof controller !== 'undefined') {
-            controller.setProperties({
-              nspaces: nspaces,
-              permissions: permissions,
-            });
-          }
-        });
-      }
-    },
-  },
-});
+  }
+
+  // TODO: This will eventually be deprecated please see
+  // https://deprecations.emberjs.com/v3.x/#toc_deprecate-router-events
+  @action
+  willTransition(transition) {
+    undefined;
+    if (
+      typeof transition !== 'undefined' &&
+      (transition.from.name.endsWith('nspaces.create') ||
+        transition.from.name.startsWith('nspace.dc.acls.tokens'))
+    ) {
+      // Only when we create, reload the nspaces in the main menu to update them
+      // as we don't block for those
+      // And also when we [Use] a token reload the nspaces that you are able to see,
+      // including your permissions for being able to manage namespaces
+      // Potentially we should just do this on every single transition
+      // but then we would need to check to see if nspaces are enabled
+      const controller = this.controllerFor('application');
+      Promise.all([
+        this.nspacesRepo.findAll(),
+        this.nspacesRepo.authorize(get(controller, 'dc.Name'), get(controller, 'nspace.Name')),
+      ]).then(([nspaces, permissions]) => {
+        if (typeof controller !== 'undefined') {
+          controller.setProperties({
+            nspaces: nspaces,
+            permissions: permissions,
+          });
+        }
+      });
+    }
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/acls.js b/ui/packages/consul-ui/app/routes/dc/acls.js
index a9e8e8e12..33a8e84e7 100644
--- a/ui/packages/consul-ui/app/routes/dc/acls.js
+++ b/ui/packages/consul-ui/app/routes/dc/acls.js
@@ -1,3 +1,3 @@
 import Route from 'consul-ui/routing/route';
 import WithBlockingActions from 'consul-ui/mixins/with-blocking-actions';
-export default Route.extend(WithBlockingActions, {});
+export default class AclsRoute extends Route.extend(WithBlockingActions) {}
diff --git a/ui/packages/consul-ui/app/routes/dc/acls/create.js b/ui/packages/consul-ui/app/routes/dc/acls/create.js
index 89ba3f4e3..f35340681 100644
--- a/ui/packages/consul-ui/app/routes/dc/acls/create.js
+++ b/ui/packages/consul-ui/app/routes/dc/acls/create.js
@@ -1,17 +1,21 @@
-import Route from 'consul-ui/routing/route';
 import { inject as service } from '@ember/service';
+import Route from 'consul-ui/routing/route';
 import { hash } from 'rsvp';
 import { get } from '@ember/object';
 
 import WithAclActions from 'consul-ui/mixins/acl/with-actions';
 
-export default Route.extend(WithAclActions, {
-  templateName: 'dc/acls/edit',
-  repo: service('repository/acl'),
-  beforeModel: function() {
+export default class CreateRoute extends Route.extend(WithAclActions) {
+  templateName = 'dc/acls/edit';
+
+  @service('repository/acl')
+  repo;
+
+  beforeModel() {
     this.repo.invalidate();
-  },
-  model: function(params) {
+  }
+
+  model(params) {
     this.item = this.repo.create({
       Datacenter: this.modelFor('dc').dc.Name,
     });
@@ -20,14 +24,16 @@ export default Route.extend(WithAclActions, {
       item: this.item,
       types: ['management', 'client'],
     });
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-  deactivate: function() {
+  }
+
+  deactivate() {
     if (get(this.item, 'isNew')) {
       this.item.destroyRecord();
     }
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/acls/edit.js b/ui/packages/consul-ui/app/routes/dc/acls/edit.js
index c3895b347..60ed4371e 100644
--- a/ui/packages/consul-ui/app/routes/dc/acls/edit.js
+++ b/ui/packages/consul-ui/app/routes/dc/acls/edit.js
@@ -1,20 +1,25 @@
-import Route from 'consul-ui/routing/route';
 import { inject as service } from '@ember/service';
+import Route from 'consul-ui/routing/route';
 import { hash } from 'rsvp';
 
 import WithAclActions from 'consul-ui/mixins/acl/with-actions';
 
-export default Route.extend(WithAclActions, {
-  repo: service('repository/acl'),
-  settings: service('settings'),
-  model: function(params) {
+export default class EditRoute extends Route.extend(WithAclActions) {
+  @service('repository/acl')
+  repo;
+
+  @service('settings')
+  settings;
+
+  model(params) {
     return hash({
       item: this.repo.findBySlug(params.id, this.modelFor('dc').dc.Name),
       types: ['management', 'client'],
     });
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/acls/index.js b/ui/packages/consul-ui/app/routes/dc/acls/index.js
index a78ab1669..41833229a 100644
--- a/ui/packages/consul-ui/app/routes/dc/acls/index.js
+++ b/ui/packages/consul-ui/app/routes/dc/acls/index.js
@@ -1,20 +1,25 @@
-import Route from 'consul-ui/routing/route';
 import { inject as service } from '@ember/service';
+import Route from 'consul-ui/routing/route';
 import { hash } from 'rsvp';
 import { get } from '@ember/object';
 
 import WithAclActions from 'consul-ui/mixins/acl/with-actions';
 
-export default Route.extend(WithAclActions, {
-  repo: service('repository/acl'),
-  settings: service('settings'),
-  queryParams: {
+export default class IndexRoute extends Route.extend(WithAclActions) {
+  @service('repository/acl')
+  repo;
+
+  @service('settings')
+  settings;
+
+  queryParams = {
     search: {
       as: 'filter',
       replace: true,
     },
-  },
-  beforeModel: function(transition) {
+  };
+
+  beforeModel(transition) {
     return this.settings.findBySlug('token').then(token => {
       // If you don't have a token set or you have a
       // token set with AccessorID set to not null (new ACL mode)
@@ -25,15 +30,17 @@ export default Route.extend(WithAclActions, {
         this.replaceWith('dc.acls.tokens');
       }
     });
-  },
-  model: function(params) {
+  }
+
+  model(params) {
     return hash({
       items: this.repo.findAllByDatacenter(this.modelFor('dc').dc.Name),
       token: this.settings.findBySlug('token'),
     });
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/acls/policies/create.js b/ui/packages/consul-ui/app/routes/dc/acls/policies/create.js
index 21781c92a..629f885fa 100644
--- a/ui/packages/consul-ui/app/routes/dc/acls/policies/create.js
+++ b/ui/packages/consul-ui/app/routes/dc/acls/policies/create.js
@@ -1,6 +1,6 @@
 import Route from './edit';
 import CreatingRoute from 'consul-ui/mixins/creating-route';
 
-export default Route.extend(CreatingRoute, {
-  templateName: 'dc/acls/policies/edit',
-});
+export default class CreateRoute extends Route.extend(CreatingRoute) {
+  templateName = 'dc/acls/policies/edit';
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/acls/policies/edit.js b/ui/packages/consul-ui/app/routes/dc/acls/policies/edit.js
index 81e21d2e0..5705a180a 100644
--- a/ui/packages/consul-ui/app/routes/dc/acls/policies/edit.js
+++ b/ui/packages/consul-ui/app/routes/dc/acls/policies/edit.js
@@ -1,18 +1,22 @@
-import SingleRoute from 'consul-ui/routing/single';
 import { inject as service } from '@ember/service';
+import SingleRoute from 'consul-ui/routing/single';
 import { hash } from 'rsvp';
 import { get } from '@ember/object';
 
 import WithPolicyActions from 'consul-ui/mixins/policy/with-actions';
 
-export default SingleRoute.extend(WithPolicyActions, {
-  repo: service('repository/policy'),
-  tokenRepo: service('repository/token'),
-  model: function(params) {
+export default class EditRoute extends SingleRoute.extend(WithPolicyActions) {
+  @service('repository/policy')
+  repo;
+
+  @service('repository/token')
+  tokenRepo;
+
+  model(params) {
     const dc = this.modelFor('dc').dc.Name;
     const nspace = this.modelFor('nspace').nspace.substr(1);
     const tokenRepo = this.tokenRepo;
-    return this._super(...arguments).then(model => {
+    return super.model(...arguments).then(model => {
       return hash({
         ...model,
         ...{
@@ -29,9 +33,10 @@ export default SingleRoute.extend(WithPolicyActions, {
         },
       });
     });
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/acls/policies/index.js b/ui/packages/consul-ui/app/routes/dc/acls/policies/index.js
index ca7b217d7..a4ec3c8be 100644
--- a/ui/packages/consul-ui/app/routes/dc/acls/policies/index.js
+++ b/ui/packages/consul-ui/app/routes/dc/acls/policies/index.js
@@ -1,19 +1,22 @@
-import Route from 'consul-ui/routing/route';
 import { inject as service } from '@ember/service';
+import Route from 'consul-ui/routing/route';
 import { hash } from 'rsvp';
 
 import WithPolicyActions from 'consul-ui/mixins/policy/with-actions';
 
-export default Route.extend(WithPolicyActions, {
-  repo: service('repository/policy'),
-  queryParams: {
+export default class IndexRoute extends Route.extend(WithPolicyActions) {
+  @service('repository/policy')
+  repo;
+
+  queryParams = {
     sortBy: 'sort',
     search: {
       as: 'filter',
       replace: true,
     },
-  },
-  model: function(params) {
+  };
+
+  model(params) {
     return hash({
       ...this.repo.status({
         items: this.repo.findAllByDatacenter(
@@ -22,9 +25,10 @@ export default Route.extend(WithPolicyActions, {
         ),
       }),
     });
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/acls/roles/create.js b/ui/packages/consul-ui/app/routes/dc/acls/roles/create.js
index 131624463..d565805a0 100644
--- a/ui/packages/consul-ui/app/routes/dc/acls/roles/create.js
+++ b/ui/packages/consul-ui/app/routes/dc/acls/roles/create.js
@@ -1,6 +1,6 @@
 import Route from './edit';
 import CreatingRoute from 'consul-ui/mixins/creating-route';
 
-export default Route.extend(CreatingRoute, {
-  templateName: 'dc/acls/roles/edit',
-});
+export default class CreateRoute extends Route.extend(CreatingRoute) {
+  templateName = 'dc/acls/roles/edit';
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/acls/roles/edit.js b/ui/packages/consul-ui/app/routes/dc/acls/roles/edit.js
index e519f4f4a..e45862e96 100644
--- a/ui/packages/consul-ui/app/routes/dc/acls/roles/edit.js
+++ b/ui/packages/consul-ui/app/routes/dc/acls/roles/edit.js
@@ -1,18 +1,22 @@
-import SingleRoute from 'consul-ui/routing/single';
 import { inject as service } from '@ember/service';
+import SingleRoute from 'consul-ui/routing/single';
 import { hash } from 'rsvp';
 import { get } from '@ember/object';
 
 import WithRoleActions from 'consul-ui/mixins/role/with-actions';
 
-export default SingleRoute.extend(WithRoleActions, {
-  repo: service('repository/role'),
-  tokenRepo: service('repository/token'),
-  model: function(params) {
+export default class EditRoute extends SingleRoute.extend(WithRoleActions) {
+  @service('repository/role')
+  repo;
+
+  @service('repository/token')
+  tokenRepo;
+
+  model(params) {
     const dc = this.modelFor('dc').dc.Name;
     const nspace = this.modelFor('nspace').nspace.substr(1);
     const tokenRepo = this.tokenRepo;
-    return this._super(...arguments).then(model => {
+    return super.model(...arguments).then(model => {
       return hash({
         ...model,
         ...{
@@ -28,9 +32,10 @@ export default SingleRoute.extend(WithRoleActions, {
         },
       });
     });
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/acls/roles/index.js b/ui/packages/consul-ui/app/routes/dc/acls/roles/index.js
index f0c52d616..089938cd6 100644
--- a/ui/packages/consul-ui/app/routes/dc/acls/roles/index.js
+++ b/ui/packages/consul-ui/app/routes/dc/acls/roles/index.js
@@ -1,19 +1,22 @@
-import Route from 'consul-ui/routing/route';
 import { inject as service } from '@ember/service';
+import Route from 'consul-ui/routing/route';
 import { hash } from 'rsvp';
 
 import WithRoleActions from 'consul-ui/mixins/role/with-actions';
 
-export default Route.extend(WithRoleActions, {
-  repo: service('repository/role'),
-  queryParams: {
+export default class IndexRoute extends Route.extend(WithRoleActions) {
+  @service('repository/role')
+  repo;
+
+  queryParams = {
     sortBy: 'sort',
     search: {
       as: 'filter',
       replace: true,
     },
-  },
-  model: function(params) {
+  };
+
+  model(params) {
     return hash({
       ...this.repo.status({
         items: this.repo.findAllByDatacenter(
@@ -22,9 +25,10 @@ export default Route.extend(WithRoleActions, {
         ),
       }),
     });
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/acls/tokens/create.js b/ui/packages/consul-ui/app/routes/dc/acls/tokens/create.js
index 3e76e6b2c..bce6c5ade 100644
--- a/ui/packages/consul-ui/app/routes/dc/acls/tokens/create.js
+++ b/ui/packages/consul-ui/app/routes/dc/acls/tokens/create.js
@@ -1,6 +1,6 @@
 import Route from './edit';
 import CreatingRoute from 'consul-ui/mixins/creating-route';
 
-export default Route.extend(CreatingRoute, {
-  templateName: 'dc/acls/tokens/edit',
-});
+export default class CreateRoute extends Route.extend(CreatingRoute) {
+  templateName = 'dc/acls/tokens/edit';
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/acls/tokens/edit.js b/ui/packages/consul-ui/app/routes/dc/acls/tokens/edit.js
index bf1b106ce..e2b0f2073 100644
--- a/ui/packages/consul-ui/app/routes/dc/acls/tokens/edit.js
+++ b/ui/packages/consul-ui/app/routes/dc/acls/tokens/edit.js
@@ -1,14 +1,18 @@
-import SingleRoute from 'consul-ui/routing/single';
 import { inject as service } from '@ember/service';
+import SingleRoute from 'consul-ui/routing/single';
 import { hash } from 'rsvp';
 
 import WithTokenActions from 'consul-ui/mixins/token/with-actions';
 
-export default SingleRoute.extend(WithTokenActions, {
-  repo: service('repository/token'),
-  settings: service('settings'),
-  model: function(params, transition) {
-    return this._super(...arguments).then(model => {
+export default class EditRoute extends SingleRoute.extend(WithTokenActions) {
+  @service('repository/token')
+  repo;
+
+  @service('settings')
+  settings;
+
+  model(params, transition) {
+    return super.model(...arguments).then(model => {
       return hash({
         ...model,
         ...{
@@ -17,9 +21,10 @@ export default SingleRoute.extend(WithTokenActions, {
         },
       });
     });
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/acls/tokens/index.js b/ui/packages/consul-ui/app/routes/dc/acls/tokens/index.js
index 29ac9dab2..f241199bb 100644
--- a/ui/packages/consul-ui/app/routes/dc/acls/tokens/index.js
+++ b/ui/packages/consul-ui/app/routes/dc/acls/tokens/index.js
@@ -1,19 +1,24 @@
-import Route from 'consul-ui/routing/route';
 import { inject as service } from '@ember/service';
+import Route from 'consul-ui/routing/route';
 import { hash } from 'rsvp';
 import { get } from '@ember/object';
 import WithTokenActions from 'consul-ui/mixins/token/with-actions';
-export default Route.extend(WithTokenActions, {
-  repo: service('repository/token'),
-  settings: service('settings'),
-  queryParams: {
+export default class IndexRoute extends Route.extend(WithTokenActions) {
+  @service('repository/token')
+  repo;
+
+  @service('settings')
+  settings;
+
+  queryParams = {
     sortBy: 'sort',
     search: {
       as: 'filter',
       replace: true,
     },
-  },
-  beforeModel: function(transition) {
+  };
+
+  beforeModel(transition) {
     return this.settings.findBySlug('token').then(token => {
       // If you have a token set with AccessorID set to null (legacy mode)
       // then rewrite to the old acls
@@ -23,8 +28,9 @@ export default Route.extend(WithTokenActions, {
         this.replaceWith('dc.acls');
       }
     });
-  },
-  model: function(params) {
+  }
+
+  model(params) {
     return hash({
       ...this.repo.status({
         items: this.repo.findAllByDatacenter(
@@ -35,9 +41,10 @@ export default Route.extend(WithTokenActions, {
       nspace: this.modelFor('nspace').nspace.substr(1),
       token: this.settings.findBySlug('token'),
     });
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/index.js b/ui/packages/consul-ui/app/routes/dc/index.js
index e3694636c..064ea8548 100644
--- a/ui/packages/consul-ui/app/routes/dc/index.js
+++ b/ui/packages/consul-ui/app/routes/dc/index.js
@@ -1,7 +1,7 @@
 import Route from 'consul-ui/routing/route';
 
-export default Route.extend({
-  beforeModel: function() {
+export default class IndexRoute extends Route {
+  beforeModel() {
     this.transitionTo('dc.services');
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/intentions/create.js b/ui/packages/consul-ui/app/routes/dc/intentions/create.js
index 3f0f9fe18..33c876eb1 100644
--- a/ui/packages/consul-ui/app/routes/dc/intentions/create.js
+++ b/ui/packages/consul-ui/app/routes/dc/intentions/create.js
@@ -1,5 +1,5 @@
 import Route from './edit';
 
-export default Route.extend({
-  templateName: 'dc/intentions/edit',
-});
+export default class CreateRoute extends Route {
+  templateName = 'dc/intentions/edit';
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/intentions/edit.js b/ui/packages/consul-ui/app/routes/dc/intentions/edit.js
index 5d24b52c2..c151cbf5b 100644
--- a/ui/packages/consul-ui/app/routes/dc/intentions/edit.js
+++ b/ui/packages/consul-ui/app/routes/dc/intentions/edit.js
@@ -1,10 +1,12 @@
-import Route from 'consul-ui/routing/route';
 import { inject as service } from '@ember/service';
+import Route from 'consul-ui/routing/route';
 import { hash } from 'rsvp';
 
-export default Route.extend({
-  repo: service('repository/intention'),
-  model: function({ intention_id }, transition) {
+export default class EditRoute extends Route {
+  @service('repository/intention')
+  repo;
+
+  model({ intention_id }, transition) {
     const dc = this.modelFor('dc').dc.Name;
     const nspace = '*';
     return hash({
@@ -17,9 +19,10 @@ export default Route.extend({
               Datacenter: dc,
             }),
     });
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/intentions/index.js b/ui/packages/consul-ui/app/routes/dc/intentions/index.js
index e3c3e2af6..19dbbf216 100644
--- a/ui/packages/consul-ui/app/routes/dc/intentions/index.js
+++ b/ui/packages/consul-ui/app/routes/dc/intentions/index.js
@@ -1,21 +1,23 @@
 import Route from 'consul-ui/routing/route';
 
-export default Route.extend({
-  queryParams: {
+export default class IndexRoute extends Route {
+  queryParams = {
     sortBy: 'sort',
     search: {
       as: 'filter',
       replace: true,
     },
-  },
-  model: function(params) {
+  };
+
+  model(params) {
     return {
       dc: this.modelFor('dc').dc.Name,
       nspace: this.modelFor('nspace').nspace.substr(1) || 'default',
     };
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/kv/create.js b/ui/packages/consul-ui/app/routes/dc/kv/create.js
index 4b9968fd0..892888a76 100644
--- a/ui/packages/consul-ui/app/routes/dc/kv/create.js
+++ b/ui/packages/consul-ui/app/routes/dc/kv/create.js
@@ -1,5 +1,5 @@
 import Route from './edit';
 
-export default Route.extend({
-  templateName: 'dc/kv/edit',
-});
+export default class CreateRoute extends Route {
+  templateName = 'dc/kv/edit';
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/kv/edit.js b/ui/packages/consul-ui/app/routes/dc/kv/edit.js
index 6005c13d4..a839cc798 100644
--- a/ui/packages/consul-ui/app/routes/dc/kv/edit.js
+++ b/ui/packages/consul-ui/app/routes/dc/kv/edit.js
@@ -1,14 +1,18 @@
-import Route from 'consul-ui/routing/route';
 import { inject as service } from '@ember/service';
+import Route from 'consul-ui/routing/route';
 import { hash } from 'rsvp';
 import { get } from '@ember/object';
 
 import ascend from 'consul-ui/utils/ascend';
 
-export default Route.extend({
-  repo: service('repository/kv'),
-  sessionRepo: service('repository/session'),
-  model: function(params) {
+export default class EditRoute extends Route {
+  @service('repository/kv')
+  repo;
+
+  @service('repository/session')
+  sessionRepo;
+
+  model(params) {
     const create =
       this.routeName
         .split('.')
@@ -46,9 +50,10 @@ export default Route.extend({
       }
       return model;
     });
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/kv/folder.js b/ui/packages/consul-ui/app/routes/dc/kv/folder.js
index 287c18c11..335447023 100644
--- a/ui/packages/consul-ui/app/routes/dc/kv/folder.js
+++ b/ui/packages/consul-ui/app/routes/dc/kv/folder.js
@@ -1,12 +1,13 @@
 import Route from './index';
 
-export default Route.extend({
-  templateName: 'dc/kv/index',
-  beforeModel: function(transition) {
-    this._super(...arguments);
+export default class FolderRoute extends Route {
+  templateName = 'dc/kv/index';
+
+  beforeModel(transition) {
+    super.beforeModel(...arguments);
     const params = this.paramsFor('dc.kv.folder');
     if (params.key === '/' || params.key == null) {
       return this.transitionTo('dc.kv.index');
     }
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/kv/index.js b/ui/packages/consul-ui/app/routes/dc/kv/index.js
index 1f4525bb5..efdf56bca 100644
--- a/ui/packages/consul-ui/app/routes/dc/kv/index.js
+++ b/ui/packages/consul-ui/app/routes/dc/kv/index.js
@@ -1,18 +1,21 @@
-import Route from 'consul-ui/routing/route';
 import { inject as service } from '@ember/service';
+import Route from 'consul-ui/routing/route';
 import { hash } from 'rsvp';
-import { get } from '@ember/object';
+import { get, action } from '@ember/object';
 import isFolder from 'consul-ui/utils/isFolder';
 
-export default Route.extend({
-  queryParams: {
+export default class IndexRoute extends Route {
+  queryParams = {
     search: {
       as: 'filter',
       replace: true,
     },
-  },
-  repo: service('repository/kv'),
-  beforeModel: function() {
+  };
+
+  @service('repository/kv')
+  repo;
+
+  beforeModel() {
     // we are index or folder, so if the key doesn't have a trailing slash
     // add one to force a fake findBySlug
     const params = this.paramsFor(this.routeName);
@@ -20,8 +23,9 @@ export default Route.extend({
     if (!isFolder(key)) {
       return this.replaceWith(this.routeName, key + '/');
     }
-  },
-  model: function(params) {
+  }
+
+  model(params) {
     let key = params.key || '/';
     const dc = this.modelFor('dc').dc.Name;
     const nspace = this.modelFor('nspace').nspace.substr(1);
@@ -43,17 +47,18 @@ export default Route.extend({
         },
       });
     });
-  },
-  actions: {
-    error: function(e) {
-      if (e.errors && e.errors[0] && e.errors[0].status == '404') {
-        return this.transitionTo('dc.kv.index');
-      }
-      throw e;
-    },
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  @action
+  error(e) {
+    if (e.errors && e.errors[0] && e.errors[0].status == '404') {
+      return this.transitionTo('dc.kv.index');
+    }
+    throw e;
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/kv/root-create.js b/ui/packages/consul-ui/app/routes/dc/kv/root-create.js
index 1e5d65859..796723b13 100644
--- a/ui/packages/consul-ui/app/routes/dc/kv/root-create.js
+++ b/ui/packages/consul-ui/app/routes/dc/kv/root-create.js
@@ -1,3 +1,3 @@
 import Route from './create';
 
-export default Route.extend();
+export default class RootCreateRoute extends Route {}
diff --git a/ui/packages/consul-ui/app/routes/dc/nodes/index.js b/ui/packages/consul-ui/app/routes/dc/nodes/index.js
index f49018ec8..0ccf913ab 100644
--- a/ui/packages/consul-ui/app/routes/dc/nodes/index.js
+++ b/ui/packages/consul-ui/app/routes/dc/nodes/index.js
@@ -1,26 +1,30 @@
-import Route from 'consul-ui/routing/route';
 import { inject as service } from '@ember/service';
+import Route from 'consul-ui/routing/route';
 import { hash } from 'rsvp';
 
-export default Route.extend({
-  data: service('data-source/service'),
-  queryParams: {
+export default class IndexRoute extends Route {
+  @service('data-source/service')
+  data;
+
+  queryParams = {
     sortBy: 'sort',
     search: {
       as: 'filter',
       replace: true,
     },
-  },
-  model: function(params) {
+  };
+
+  model(params) {
     const dc = this.modelFor('dc').dc.Name;
     const nspace = '*';
     return hash({
       items: this.data.source(uri => uri`/${nspace}/${dc}/nodes`),
       leader: this.data.source(uri => uri`/${nspace}/${dc}/leader`),
     });
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/nodes/show.js b/ui/packages/consul-ui/app/routes/dc/nodes/show.js
index 7a8ae9330..087dc573f 100644
--- a/ui/packages/consul-ui/app/routes/dc/nodes/show.js
+++ b/ui/packages/consul-ui/app/routes/dc/nodes/show.js
@@ -1,10 +1,12 @@
-import Route from 'consul-ui/routing/route';
 import { inject as service } from '@ember/service';
+import Route from 'consul-ui/routing/route';
 import { hash } from 'rsvp';
 
-export default Route.extend({
-  data: service('data-source/service'),
-  model: function(params) {
+export default class ShowRoute extends Route {
+  @service('data-source/service')
+  data;
+
+  model(params) {
     const dc = this.modelFor('dc').dc.Name;
     const nspace = this.modelFor('nspace').nspace.substr(1);
     const name = params.name;
@@ -18,9 +20,10 @@ export default Route.extend({
         tomography: this.data.source(uri => uri`/${nspace}/${dc}/coordinates/for-node/${name}`),
       });
     });
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/nodes/show/healthchecks.js b/ui/packages/consul-ui/app/routes/dc/nodes/show/healthchecks.js
index 87d8c2665..feb40dc04 100644
--- a/ui/packages/consul-ui/app/routes/dc/nodes/show/healthchecks.js
+++ b/ui/packages/consul-ui/app/routes/dc/nodes/show/healthchecks.js
@@ -1,15 +1,16 @@
 import Route from 'consul-ui/routing/route';
 
-export default Route.extend({
-  model: function() {
+export default class HealthchecksRoute extends Route {
+  model() {
     const parent = this.routeName
       .split('.')
       .slice(0, -1)
       .join('.');
     return this.modelFor(parent);
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/nodes/show/index.js b/ui/packages/consul-ui/app/routes/dc/nodes/show/index.js
index a12f75bc1..f08762f5b 100644
--- a/ui/packages/consul-ui/app/routes/dc/nodes/show/index.js
+++ b/ui/packages/consul-ui/app/routes/dc/nodes/show/index.js
@@ -1,8 +1,8 @@
 import Route from 'consul-ui/routing/route';
 import { get } from '@ember/object';
 
-export default Route.extend({
-  afterModel: function(model, transition) {
+export default class IndexRoute extends Route {
+  afterModel(model, transition) {
     const parent = this.routeName
       .split('.')
       .slice(0, -1)
@@ -11,5 +11,5 @@ export default Route.extend({
     // so check the length here.
     const to = get(model, 'item.Checks.length') > 0 ? 'healthchecks' : 'services';
     this.replaceWith(`${parent}.${to}`, model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/nodes/show/metadata.js b/ui/packages/consul-ui/app/routes/dc/nodes/show/metadata.js
index 87d8c2665..1d065d45d 100644
--- a/ui/packages/consul-ui/app/routes/dc/nodes/show/metadata.js
+++ b/ui/packages/consul-ui/app/routes/dc/nodes/show/metadata.js
@@ -1,15 +1,16 @@
 import Route from 'consul-ui/routing/route';
 
-export default Route.extend({
-  model: function() {
+export default class MetadataRoute extends Route {
+  model() {
     const parent = this.routeName
       .split('.')
       .slice(0, -1)
       .join('.');
     return this.modelFor(parent);
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/nodes/show/rtt.js b/ui/packages/consul-ui/app/routes/dc/nodes/show/rtt.js
index 79a2eb6c2..6ae31b2e2 100644
--- a/ui/packages/consul-ui/app/routes/dc/nodes/show/rtt.js
+++ b/ui/packages/consul-ui/app/routes/dc/nodes/show/rtt.js
@@ -1,15 +1,16 @@
 import Route from 'consul-ui/routing/route';
 import { get } from '@ember/object';
 
-export default Route.extend({
-  model: function() {
+export default class RttRoute extends Route {
+  model() {
     const parent = this.routeName
       .split('.')
       .slice(0, -1)
       .join('.');
     return this.modelFor(parent);
-  },
-  afterModel: function(model, transition) {
+  }
+
+  afterModel(model, transition) {
     if (!get(model, 'tomography.distances')) {
       const parent = this.routeName
         .split('.')
@@ -17,9 +18,10 @@ export default Route.extend({
         .join('.');
       this.replaceWith(parent);
     }
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/nodes/show/services.js b/ui/packages/consul-ui/app/routes/dc/nodes/show/services.js
index 99471befc..5dbd9b712 100644
--- a/ui/packages/consul-ui/app/routes/dc/nodes/show/services.js
+++ b/ui/packages/consul-ui/app/routes/dc/nodes/show/services.js
@@ -1,21 +1,23 @@
 import Route from 'consul-ui/routing/route';
 
-export default Route.extend({
-  queryParams: {
+export default class ServicesRoute extends Route {
+  queryParams = {
     search: {
       as: 'filter',
       replace: true,
     },
-  },
-  model: function() {
+  };
+
+  model() {
     const parent = this.routeName
       .split('.')
       .slice(0, -1)
       .join('.');
     return this.modelFor(parent);
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/nodes/show/sessions.js b/ui/packages/consul-ui/app/routes/dc/nodes/show/sessions.js
index a2cc3deee..fb8bd9c7b 100644
--- a/ui/packages/consul-ui/app/routes/dc/nodes/show/sessions.js
+++ b/ui/packages/consul-ui/app/routes/dc/nodes/show/sessions.js
@@ -1,13 +1,20 @@
-import Route from 'consul-ui/routing/route';
+import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
+import Route from 'consul-ui/routing/route';
 import { hash } from 'rsvp';
 import WithBlockingActions from 'consul-ui/mixins/with-blocking-actions';
 
-export default Route.extend(WithBlockingActions, {
-  data: service('data-source/service'),
-  sessionRepo: service('repository/session'),
-  feedback: service('feedback'),
-  model: function() {
+export default class SessionsRoute extends Route.extend(WithBlockingActions) {
+  @service('data-source/service')
+  data;
+
+  @service('repository/session')
+  sessionRepo;
+
+  @service('feedback')
+  feedback;
+
+  model() {
     const parent = this.routeName
       .split('.')
       .slice(0, -1)
@@ -21,19 +28,20 @@ export default Route.extend(WithBlockingActions, {
       node: node,
       sessions: this.data.source(uri => uri`/${nspace}/${dc}/sessions/for-node/${node}`),
     });
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-  actions: {
-    invalidateSession: function(item) {
-      const route = this;
-      return this.feedback.execute(() => {
-        return this.sessionRepo.remove(item).then(() => {
-          route.refresh();
-        });
-      }, 'delete');
-    },
-  },
-});
+  }
+
+  @action
+  invalidateSession(item) {
+    const route = this;
+    return this.feedback.execute(() => {
+      return this.sessionRepo.remove(item).then(() => {
+        route.refresh();
+      });
+    }, 'delete');
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/nspaces/create.js b/ui/packages/consul-ui/app/routes/dc/nspaces/create.js
index fabd7a8fc..f1599c6eb 100644
--- a/ui/packages/consul-ui/app/routes/dc/nspaces/create.js
+++ b/ui/packages/consul-ui/app/routes/dc/nspaces/create.js
@@ -1,14 +1,15 @@
 import Route from './edit';
 import CreatingRoute from 'consul-ui/mixins/creating-route';
 
-export default Route.extend(CreatingRoute, {
-  templateName: 'dc/nspaces/edit',
-  beforeModel: function() {
+export default class CreateRoute extends Route.extend(CreatingRoute) {
+  templateName = 'dc/nspaces/edit';
+
+  beforeModel() {
     // we need to skip CreatingRoute.beforeModel here
     // TODO(octane): ideally we'd like to call Route.beforeModel
     // but its not clear how to do that with old ember
     // maybe it will be more normal with modern ember
     // up until now we haven't been calling super here anyway
     // so this is probably ok until we can skip a parent super
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/nspaces/edit.js b/ui/packages/consul-ui/app/routes/dc/nspaces/edit.js
index 68da2a276..28dc3408b 100644
--- a/ui/packages/consul-ui/app/routes/dc/nspaces/edit.js
+++ b/ui/packages/consul-ui/app/routes/dc/nspaces/edit.js
@@ -1,15 +1,18 @@
-import Route from 'consul-ui/routing/route';
 import { inject as service } from '@ember/service';
+import Route from 'consul-ui/routing/route';
 import { hash } from 'rsvp';
 
 import WithNspaceActions from 'consul-ui/mixins/nspace/with-actions';
 
-export default Route.extend(WithNspaceActions, {
-  repo: service('repository/nspace'),
-  isCreate: function(params, transition) {
+export default class EditRoute extends Route.extend(WithNspaceActions) {
+  @service('repository/nspace')
+  repo;
+
+  isCreate(params, transition) {
     return transition.targetName.split('.').pop() === 'create';
-  },
-  model: function(params, transition) {
+  }
+
+  model(params, transition) {
     const repo = this.repo;
     const create = this.isCreate(...arguments);
     const dc = this.modelFor('dc').dc.Name;
@@ -27,9 +30,10 @@ export default Route.extend(WithNspaceActions, {
           )
         : repo.findBySlug(params.name),
     });
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/nspaces/index.js b/ui/packages/consul-ui/app/routes/dc/nspaces/index.js
index 8bcc45979..72c380c95 100644
--- a/ui/packages/consul-ui/app/routes/dc/nspaces/index.js
+++ b/ui/packages/consul-ui/app/routes/dc/nspaces/index.js
@@ -1,25 +1,31 @@
-import Route from 'consul-ui/routing/route';
 import { inject as service } from '@ember/service';
+import Route from 'consul-ui/routing/route';
 import { hash } from 'rsvp';
 
 import WithNspaceActions from 'consul-ui/mixins/nspace/with-actions';
-export default Route.extend(WithNspaceActions, {
-  data: service('data-source/service'),
-  repo: service('repository/nspace'),
-  queryParams: {
+export default class IndexRoute extends Route.extend(WithNspaceActions) {
+  @service('data-source/service')
+  data;
+
+  @service('repository/nspace')
+  repo;
+
+  queryParams = {
     sortBy: 'sort',
     search: {
       as: 'filter',
       replace: true,
     },
-  },
-  model: function(params) {
+  };
+
+  model(params) {
     return hash({
       items: this.data.source(uri => uri`/*/*/namespaces`),
     });
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/services/index.js b/ui/packages/consul-ui/app/routes/dc/services/index.js
index 58441da9d..d999f25b9 100644
--- a/ui/packages/consul-ui/app/routes/dc/services/index.js
+++ b/ui/packages/consul-ui/app/routes/dc/services/index.js
@@ -1,10 +1,12 @@
-import Route from 'consul-ui/routing/route';
 import { inject as service } from '@ember/service';
+import Route from 'consul-ui/routing/route';
 import { hash } from 'rsvp';
 
-export default Route.extend({
-  data: service('data-source/service'),
-  queryParams: {
+export default class IndexRoute extends Route {
+  @service('data-source/service')
+  data;
+
+  queryParams = {
     search: {
       as: 'filter',
       replace: true,
@@ -13,8 +15,9 @@ export default Route.extend({
     status: {
       as: 'status',
     },
-  },
-  model: function(params) {
+  };
+
+  model(params) {
     let terms = params.s || '';
     // we check for the old style `status` variable here
     // and convert it to the new style filter=status:critical
@@ -37,9 +40,10 @@ export default Route.extend({
       terms: terms !== '' ? terms.split('\n') : [],
       items: this.data.source(uri => uri`/${nspace}/${dc}/services`),
     });
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/services/instance.js b/ui/packages/consul-ui/app/routes/dc/services/instance.js
index 0bac35b1c..ae73574a1 100644
--- a/ui/packages/consul-ui/app/routes/dc/services/instance.js
+++ b/ui/packages/consul-ui/app/routes/dc/services/instance.js
@@ -1,11 +1,13 @@
-import Route from 'consul-ui/routing/route';
 import { inject as service } from '@ember/service';
+import Route from 'consul-ui/routing/route';
 import { hash } from 'rsvp';
 import { get } from '@ember/object';
 
-export default Route.extend({
-  data: service('data-source/service'),
-  model: function(params) {
+export default class InstanceRoute extends Route {
+  @service('data-source/service')
+  data;
+
+  model(params) {
     const dc = this.modelFor('dc').dc.Name;
     const nspace = this.modelFor('nspace').nspace.substr(1) || 'default';
     return hash({
@@ -47,9 +49,10 @@ export default Route.extend({
         });
       });
     });
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/services/instance/addresses.js b/ui/packages/consul-ui/app/routes/dc/services/instance/addresses.js
index 80ca41f6d..d0b857175 100644
--- a/ui/packages/consul-ui/app/routes/dc/services/instance/addresses.js
+++ b/ui/packages/consul-ui/app/routes/dc/services/instance/addresses.js
@@ -1,15 +1,16 @@
 import Route from 'consul-ui/routing/route';
 import { get } from '@ember/object';
 
-export default Route.extend({
-  model: function() {
+export default class AddressesRoute extends Route {
+  model() {
     const parent = this.routeName
       .split('.')
       .slice(0, -1)
       .join('.');
     return this.modelFor(parent);
-  },
-  afterModel: function(model, transition) {
+  }
+
+  afterModel(model, transition) {
     if (get(model, 'item.Service.Kind') !== 'mesh-gateway') {
       const parent = this.routeName
         .split('.')
@@ -17,9 +18,10 @@ export default Route.extend({
         .join('.');
       this.replaceWith(parent);
     }
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/services/instance/exposedpaths.js b/ui/packages/consul-ui/app/routes/dc/services/instance/exposedpaths.js
index 156016c5c..1fcd436c4 100644
--- a/ui/packages/consul-ui/app/routes/dc/services/instance/exposedpaths.js
+++ b/ui/packages/consul-ui/app/routes/dc/services/instance/exposedpaths.js
@@ -1,15 +1,16 @@
 import Route from 'consul-ui/routing/route';
 import { get } from '@ember/object';
 
-export default Route.extend({
-  model: function() {
+export default class ExposedpathsRoute extends Route {
+  model() {
     const parent = this.routeName
       .split('.')
       .slice(0, -1)
       .join('.');
     return this.modelFor(parent);
-  },
-  afterModel: function(model, transition) {
+  }
+
+  afterModel(model, transition) {
     if (
       get(model, 'item.Kind') !== 'connect-proxy' ||
       get(model, 'item.Proxy.Expose.Paths.length') < 1
@@ -20,9 +21,10 @@ export default Route.extend({
         .join('.');
       this.replaceWith(parent);
     }
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/services/instance/healthchecks.js b/ui/packages/consul-ui/app/routes/dc/services/instance/healthchecks.js
index 87d8c2665..feb40dc04 100644
--- a/ui/packages/consul-ui/app/routes/dc/services/instance/healthchecks.js
+++ b/ui/packages/consul-ui/app/routes/dc/services/instance/healthchecks.js
@@ -1,15 +1,16 @@
 import Route from 'consul-ui/routing/route';
 
-export default Route.extend({
-  model: function() {
+export default class HealthchecksRoute extends Route {
+  model() {
     const parent = this.routeName
       .split('.')
       .slice(0, -1)
       .join('.');
     return this.modelFor(parent);
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/services/instance/metadata.js b/ui/packages/consul-ui/app/routes/dc/services/instance/metadata.js
index 87d8c2665..1d065d45d 100644
--- a/ui/packages/consul-ui/app/routes/dc/services/instance/metadata.js
+++ b/ui/packages/consul-ui/app/routes/dc/services/instance/metadata.js
@@ -1,15 +1,16 @@
 import Route from 'consul-ui/routing/route';
 
-export default Route.extend({
-  model: function() {
+export default class MetadataRoute extends Route {
+  model() {
     const parent = this.routeName
       .split('.')
       .slice(0, -1)
       .join('.');
     return this.modelFor(parent);
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/services/instance/proxy.js b/ui/packages/consul-ui/app/routes/dc/services/instance/proxy.js
index 87d8c2665..bfe639d63 100644
--- a/ui/packages/consul-ui/app/routes/dc/services/instance/proxy.js
+++ b/ui/packages/consul-ui/app/routes/dc/services/instance/proxy.js
@@ -1,15 +1,16 @@
 import Route from 'consul-ui/routing/route';
 
-export default Route.extend({
-  model: function() {
+export default class ProxyRoute extends Route {
+  model() {
     const parent = this.routeName
       .split('.')
       .slice(0, -1)
       .join('.');
     return this.modelFor(parent);
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/services/instance/upstreams.js b/ui/packages/consul-ui/app/routes/dc/services/instance/upstreams.js
index 2bdffb3a8..cde1b0839 100644
--- a/ui/packages/consul-ui/app/routes/dc/services/instance/upstreams.js
+++ b/ui/packages/consul-ui/app/routes/dc/services/instance/upstreams.js
@@ -1,15 +1,16 @@
 import Route from 'consul-ui/routing/route';
 import { get } from '@ember/object';
 
-export default Route.extend({
-  model: function() {
+export default class UpstreamsRoute extends Route {
+  model() {
     const parent = this.routeName
       .split('.')
       .slice(0, -1)
       .join('.');
     return this.modelFor(parent);
-  },
-  afterModel: function(model, transition) {
+  }
+
+  afterModel(model, transition) {
     if (get(model, 'item.Service.Kind') !== 'connect-proxy') {
       const parent = this.routeName
         .split('.')
@@ -17,9 +18,10 @@ export default Route.extend({
         .join('.');
       this.replaceWith(parent);
     }
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/services/notfound.js b/ui/packages/consul-ui/app/routes/dc/services/notfound.js
index 74dda4a60..d58d8fa61 100644
--- a/ui/packages/consul-ui/app/routes/dc/services/notfound.js
+++ b/ui/packages/consul-ui/app/routes/dc/services/notfound.js
@@ -1,7 +1,7 @@
 import Route from 'consul-ui/routing/route';
 
-export default Route.extend({
-  redirect: function(model, transition) {
+export default class NotfoundRoute extends Route {
+  redirect(model, transition) {
     this.replaceWith('dc.services.instance', model.name, model.node, model.id);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/services/show.js b/ui/packages/consul-ui/app/routes/dc/services/show.js
index 9ed340724..d6ca70b18 100644
--- a/ui/packages/consul-ui/app/routes/dc/services/show.js
+++ b/ui/packages/consul-ui/app/routes/dc/services/show.js
@@ -1,12 +1,16 @@
-import Route from 'consul-ui/routing/route';
 import { inject as service } from '@ember/service';
+import Route from 'consul-ui/routing/route';
 import { hash } from 'rsvp';
 import { get } from '@ember/object';
 
-export default Route.extend({
-  data: service('data-source/service'),
-  config: service('ui-config'),
-  model: function(params, transition) {
+export default class ShowRoute extends Route {
+  @service('data-source/service')
+  data;
+
+  @service('ui-config')
+  config;
+
+  model(params, transition) {
     const dc = this.modelFor('dc').dc.Name;
     const nspace = this.modelFor('nspace').nspace.substr(1);
     return hash({
@@ -54,9 +58,10 @@ export default Route.extend({
               ),
             });
       });
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/services/show/index.js b/ui/packages/consul-ui/app/routes/dc/services/show/index.js
index c7294faa7..18647d63f 100644
--- a/ui/packages/consul-ui/app/routes/dc/services/show/index.js
+++ b/ui/packages/consul-ui/app/routes/dc/services/show/index.js
@@ -1,8 +1,8 @@
 import Route from '@ember/routing/route';
 import { get } from '@ember/object';
 
-export default Route.extend({
-  afterModel: function(model, transition) {
+export default class IndexRoute extends Route {
+  afterModel(model, transition) {
     const parent = this.routeName
       .split('.')
       .slice(0, -1)
@@ -33,5 +33,5 @@ export default Route.extend({
     }
 
     this.replaceWith(`${parent}.${to}`, parentModel);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/services/show/instances.js b/ui/packages/consul-ui/app/routes/dc/services/show/instances.js
index 99471befc..e280065e0 100644
--- a/ui/packages/consul-ui/app/routes/dc/services/show/instances.js
+++ b/ui/packages/consul-ui/app/routes/dc/services/show/instances.js
@@ -1,21 +1,23 @@
 import Route from 'consul-ui/routing/route';
 
-export default Route.extend({
-  queryParams: {
+export default class InstancesRoute extends Route {
+  queryParams = {
     search: {
       as: 'filter',
       replace: true,
     },
-  },
-  model: function() {
+  };
+
+  model() {
     const parent = this.routeName
       .split('.')
       .slice(0, -1)
       .join('.');
     return this.modelFor(parent);
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/services/show/intentions.js b/ui/packages/consul-ui/app/routes/dc/services/show/intentions.js
index de21844a9..73133f7ac 100644
--- a/ui/packages/consul-ui/app/routes/dc/services/show/intentions.js
+++ b/ui/packages/consul-ui/app/routes/dc/services/show/intentions.js
@@ -1,8 +1,8 @@
 import Route from 'consul-ui/routing/route';
 
-export default Route.extend({
-  setupController: function(controller, model) {
-    this._super(...arguments);
+export default class IntentionsRoute extends Route {
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/services/show/intentions/create.js b/ui/packages/consul-ui/app/routes/dc/services/show/intentions/create.js
index cc7150af5..d505070cf 100644
--- a/ui/packages/consul-ui/app/routes/dc/services/show/intentions/create.js
+++ b/ui/packages/consul-ui/app/routes/dc/services/show/intentions/create.js
@@ -1,5 +1,5 @@
 import Route from './edit';
 
-export default Route.extend({
-  templateName: 'dc/services/show/intentions/edit',
-});
+export default class CreateRoute extends Route {
+  templateName = 'dc/services/show/intentions/edit';
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/services/show/intentions/edit.js b/ui/packages/consul-ui/app/routes/dc/services/show/intentions/edit.js
index d721d9578..b241e75d9 100644
--- a/ui/packages/consul-ui/app/routes/dc/services/show/intentions/edit.js
+++ b/ui/packages/consul-ui/app/routes/dc/services/show/intentions/edit.js
@@ -1,16 +1,17 @@
 import Route from 'consul-ui/routing/route';
 
-export default Route.extend({
-  model: function(params, transition) {
+export default class EditRoute extends Route {
+  model(params, transition) {
     return {
       nspace: '*',
       dc: this.paramsFor('dc').dc,
       service: this.paramsFor('dc.services.show').name,
       src: params.intention_id,
     };
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/services/show/intentions/index.js b/ui/packages/consul-ui/app/routes/dc/services/show/intentions/index.js
index f0e2b3a50..c3d605729 100644
--- a/ui/packages/consul-ui/app/routes/dc/services/show/intentions/index.js
+++ b/ui/packages/consul-ui/app/routes/dc/services/show/intentions/index.js
@@ -1,21 +1,23 @@
 import Route from 'consul-ui/routing/route';
 
-export default Route.extend({
-  queryParams: {
+export default class IndexRoute extends Route {
+  queryParams = {
     search: {
       as: 'filter',
       replace: true,
     },
-  },
-  model: function(params) {
+  };
+
+  model(params) {
     return {
       dc: this.modelFor('dc').dc.Name,
       nspace: this.modelFor('nspace').nspace.substr(1) || 'default',
       slug: this.paramsFor('dc.services.show').name,
     };
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/services/show/routing.js b/ui/packages/consul-ui/app/routes/dc/services/show/routing.js
index a4f90f65e..e5045782b 100644
--- a/ui/packages/consul-ui/app/routes/dc/services/show/routing.js
+++ b/ui/packages/consul-ui/app/routes/dc/services/show/routing.js
@@ -1,15 +1,16 @@
 import Route from 'consul-ui/routing/route';
 import { get } from '@ember/object';
 
-export default Route.extend({
-  model: function() {
+export default class RoutingRoute extends Route {
+  model() {
     const parent = this.routeName
       .split('.')
       .slice(0, -1)
       .join('.');
     return this.modelFor(parent);
-  },
-  afterModel: function(model, transition) {
+  }
+
+  afterModel(model, transition) {
     if (!get(model, 'chain')) {
       const parent = this.routeName
         .split('.')
@@ -17,9 +18,10 @@ export default Route.extend({
         .join('.');
       this.replaceWith(parent);
     }
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/services/show/services.js b/ui/packages/consul-ui/app/routes/dc/services/show/services.js
index 096c9ff8b..927d4b7be 100644
--- a/ui/packages/consul-ui/app/routes/dc/services/show/services.js
+++ b/ui/packages/consul-ui/app/routes/dc/services/show/services.js
@@ -1,10 +1,12 @@
-import Route from 'consul-ui/routing/route';
 import { inject as service } from '@ember/service';
+import Route from 'consul-ui/routing/route';
 import { hash } from 'rsvp';
 
-export default Route.extend({
-  data: service('data-source/service'),
-  model: function() {
+export default class ServicesRoute extends Route {
+  @service('data-source/service')
+  data;
+
+  model() {
     const dc = this.modelFor('dc').dc.Name;
     const nspace = this.modelFor('nspace').nspace.substr(1);
     const parent = this.routeName
@@ -17,9 +19,10 @@ export default Route.extend({
       nspace: nspace,
       gatewayServices: this.data.source(uri => uri`/${nspace}/${dc}/gateways/for-service/${name}`),
     });
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/services/show/tags.js b/ui/packages/consul-ui/app/routes/dc/services/show/tags.js
index 87d8c2665..3c6b4e0f0 100644
--- a/ui/packages/consul-ui/app/routes/dc/services/show/tags.js
+++ b/ui/packages/consul-ui/app/routes/dc/services/show/tags.js
@@ -1,15 +1,16 @@
 import Route from 'consul-ui/routing/route';
 
-export default Route.extend({
-  model: function() {
+export default class TagsRoute extends Route {
+  model() {
     const parent = this.routeName
       .split('.')
       .slice(0, -1)
       .join('.');
     return this.modelFor(parent);
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/services/show/topology.js b/ui/packages/consul-ui/app/routes/dc/services/show/topology.js
index 4311f0d0c..b5c644e52 100644
--- a/ui/packages/consul-ui/app/routes/dc/services/show/topology.js
+++ b/ui/packages/consul-ui/app/routes/dc/services/show/topology.js
@@ -1,15 +1,16 @@
 import Route from '@ember/routing/route';
 
-export default Route.extend({
-  model: function() {
+export default class TopologyRoute extends Route {
+  model() {
     const parent = this.routeName
       .split('.')
       .slice(0, -1)
       .join('.');
     return this.modelFor(parent);
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/services/show/upstreams.js b/ui/packages/consul-ui/app/routes/dc/services/show/upstreams.js
index 6125e6d10..338d607d4 100644
--- a/ui/packages/consul-ui/app/routes/dc/services/show/upstreams.js
+++ b/ui/packages/consul-ui/app/routes/dc/services/show/upstreams.js
@@ -1,5 +1,5 @@
 import Route from './services';
 
-export default Route.extend({
-  templateName: 'dc/services/show/upstreams',
-});
+export default class UpstreamsRoute extends Route {
+  templateName = 'dc/services/show/upstreams';
+}
diff --git a/ui/packages/consul-ui/app/routes/index.js b/ui/packages/consul-ui/app/routes/index.js
index b469ac2ee..fc88f0570 100644
--- a/ui/packages/consul-ui/app/routes/index.js
+++ b/ui/packages/consul-ui/app/routes/index.js
@@ -1,16 +1,19 @@
-import Route from 'consul-ui/routing/route';
 import { inject as service } from '@ember/service';
+import Route from 'consul-ui/routing/route';
 import { hash } from 'rsvp';
 import { get } from '@ember/object';
 
-export default Route.extend({
-  repo: service('repository/dc'),
-  model: function(params) {
+export default class IndexRoute extends Route {
+  @service('repository/dc')
+  repo;
+
+  model(params) {
     return hash({
       item: this.repo.getActive(),
     });
-  },
-  afterModel: function({ item }, transition) {
+  }
+
+  afterModel({ item }, transition) {
     this.transitionTo('dc.services', get(item, 'Name'));
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/notfound.js b/ui/packages/consul-ui/app/routes/notfound.js
index bd50ac724..3ee38c6be 100644
--- a/ui/packages/consul-ui/app/routes/notfound.js
+++ b/ui/packages/consul-ui/app/routes/notfound.js
@@ -1,10 +1,10 @@
 import Route from 'consul-ui/routing/route';
 import Error from '@ember/error';
 
-export default Route.extend({
-  beforeModel: function() {
+export default class NotfoundRoute extends Route {
+  beforeModel() {
     const e = new Error('Page not found');
     e.code = 404;
     throw e;
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/nspace.js b/ui/packages/consul-ui/app/routes/nspace.js
index 9a1acc3e5..148c28846 100644
--- a/ui/packages/consul-ui/app/routes/nspace.js
+++ b/ui/packages/consul-ui/app/routes/nspace.js
@@ -1,14 +1,18 @@
-import Route from 'consul-ui/routing/route';
 import { inject as service } from '@ember/service';
+import Route from 'consul-ui/routing/route';
 import { hash } from 'rsvp';
 import { getOwner } from '@ember/application';
 import { env } from 'consul-ui/env';
 import transitionable from 'consul-ui/utils/routing/transitionable';
 
 const DEFAULT_NSPACE_PARAM = '~default';
-export default Route.extend({
-  repo: service('repository/dc'),
-  router: service('router'),
+export default class NspaceRoute extends Route {
+  @service('repository/dc')
+  repo;
+
+  @service('router')
+  router;
+
   // The ember router seems to change the priority of individual routes
   // depending on whether they are wildcard routes or not.
   // This means that the namespace routes will be recognized before kv ones
@@ -22,7 +26,7 @@ export default Route.extend({
   // information that we generated onto the route, which leaves us with the route
   // we actually want. Using this final route information we redirect the user
   // to where they wanted to go.
-  beforeModel: function(transition) {
+  beforeModel(transition) {
     if (!this.paramsFor('nspace').nspace.startsWith('~')) {
       const url = `${env('rootURL')}${DEFAULT_NSPACE_PARAM}${transition.intent.url}`;
       const route = this.router.recognize(url);
@@ -37,13 +41,14 @@ export default Route.extend({
         ...params.slice(1),
       ]);
     }
-  },
-  model: function(params) {
+  }
+
+  model(params) {
     return hash({
       item: this.repo.getActive(),
       nspace: params.nspace,
     });
-  },
+  }
 
   /**
    * We need to redirect if someone doesn't specify the section they want,
@@ -64,5 +69,5 @@ export default Route.extend({
         this.transitionTo('dc.services', model.nspace);
       }
     }
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/routes/settings.js b/ui/packages/consul-ui/app/routes/settings.js
index 57e970f0f..6cdf65380 100644
--- a/ui/packages/consul-ui/app/routes/settings.js
+++ b/ui/packages/consul-ui/app/routes/settings.js
@@ -1,14 +1,22 @@
-import Route from 'consul-ui/routing/route';
 import { inject as service } from '@ember/service';
+import Route from 'consul-ui/routing/route';
 import { hash } from 'rsvp';
-import { get, set } from '@ember/object';
+import { get, set, action } from '@ember/object';
 
-export default Route.extend({
-  client: service('client/http'),
-  repo: service('settings'),
-  dcRepo: service('repository/dc'),
-  nspacesRepo: service('repository/nspace/disabled'),
-  model: function(params) {
+export default class SettingsRoute extends Route {
+  @service('client/http')
+  client;
+
+  @service('settings')
+  repo;
+
+  @service('repository/dc')
+  dcRepo;
+
+  @service('repository/nspace/disabled')
+  nspacesRepo;
+
+  model(params) {
     const app = this.modelFor('application');
     return hash({
       item: this.repo.findAll(),
@@ -20,23 +28,24 @@ export default Route.extend({
       }
       return model;
     });
-  },
-  setupController: function(controller, model) {
-    this._super(...arguments);
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
     controller.setProperties(model);
-  },
-  actions: {
-    update: function(slug, item) {
-      switch (slug) {
-        case 'client':
-          if (!get(item, 'client.blocking')) {
-            this.client.abort();
-          }
-          break;
-      }
-      this.repo.persist({
-        [slug]: item,
-      });
-    },
-  },
-});
+  }
+
+  @action
+  update(slug, item) {
+    switch (slug) {
+      case 'client':
+        if (!get(item, 'client.blocking')) {
+          this.client.abort();
+        }
+        break;
+    }
+    this.repo.persist({
+      [slug]: item,
+    });
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/atob.js b/ui/packages/consul-ui/app/services/atob.js
index d01d37e1b..712650436 100644
--- a/ui/packages/consul-ui/app/services/atob.js
+++ b/ui/packages/consul-ui/app/services/atob.js
@@ -1,7 +1,7 @@
 import Service from '@ember/service';
 import atob from 'consul-ui/utils/atob';
-export default Service.extend({
-  execute: function() {
+export default class AtobService extends Service {
+  execute() {
     return atob(...arguments);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/btoa.js b/ui/packages/consul-ui/app/services/btoa.js
index d3d0c131e..32d5a1eed 100644
--- a/ui/packages/consul-ui/app/services/btoa.js
+++ b/ui/packages/consul-ui/app/services/btoa.js
@@ -1,7 +1,7 @@
 import Service from '@ember/service';
 import btoa from 'consul-ui/utils/btoa';
-export default Service.extend({
-  execute: function() {
+export default class BtoaService extends Service {
+  execute() {
     return btoa(...arguments);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/change.js b/ui/packages/consul-ui/app/services/change.js
index a5150464d..a4b22f095 100644
--- a/ui/packages/consul-ui/app/services/change.js
+++ b/ui/packages/consul-ui/app/services/change.js
@@ -13,17 +13,20 @@ const validators = {
   'intention-permission-http-header': intentionPermissionHttpHeaderValidator,
 };
 
-export default Service.extend({
-  schema: service('schema'),
+export default class ChangeService extends Service {
+  @service('schema')
+  schema;
 
-  init: function() {
-    this._super(...arguments);
+  init() {
+    super.init(...arguments);
     this._validators = new Map();
-  },
-  willDestroy: function() {
+  }
+
+  willDestroy() {
     this._validators = null;
-  },
-  changesetFor: function(modelName, model, options = {}) {
+  }
+
+  changesetFor(modelName, model, options = {}) {
     const validator = this.validatorFor(modelName, options);
     let changeset;
     if (validator) {
@@ -36,8 +39,9 @@ export default Service.extend({
       changeset = createChangeset(model);
     }
     return changeset;
-  },
-  validatorFor: function(modelName, options = {}) {
+  }
+
+  validatorFor(modelName, options = {}) {
     if (!this._validators.has(modelName)) {
       const factory = validators[modelName];
       let validator;
@@ -47,5 +51,5 @@ export default Service.extend({
       this._validators.set(modelName, validator);
     }
     return this._validators.get(modelName);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/client/connections.js b/ui/packages/consul-ui/app/services/client/connections.js
index 32f11214d..45e7cb725 100644
--- a/ui/packages/consul-ui/app/services/client/connections.js
+++ b/ui/packages/consul-ui/app/services/client/connections.js
@@ -1,22 +1,29 @@
 import Service, { inject as service } from '@ember/service';
 
-export default Service.extend({
-  dom: service('dom'),
-  env: service('env'),
-  data: service('data-source/service'),
-  sources: service('repository/type/event-source'),
-  init: function() {
-    this._super(...arguments);
+export default class ConnectionsService extends Service {
+  @service('dom')
+  dom;
+
+  @service('env')
+  env;
+
+  @service('data-source/service')
+  data;
+
+  init() {
+    super.init(...arguments);
     this._listeners = this.dom.listeners();
     this.connections = new Set();
     this.addVisibilityChange();
-  },
-  willDestroy: function() {
+  }
+
+  willDestroy() {
     this._listeners.remove();
     this.purge();
-    this._super(...arguments);
-  },
-  addVisibilityChange: function() {
+    super.willDestroy(...arguments);
+  }
+
+  addVisibilityChange() {
     // when the user hides the tab, abort all connections
     this._listeners.add(this.dom.document(), {
       visibilitychange: e => {
@@ -25,8 +32,9 @@ export default Service.extend({
         }
       },
     });
-  },
-  whenAvailable: function(e) {
+  }
+
+  whenAvailable(e) {
     // if the user has hidden the tab (hidden browser/tab switch)
     // any aborted errors should restart
     const doc = this.dom.document();
@@ -43,15 +51,17 @@ export default Service.extend({
       });
     }
     return Promise.resolve(e);
-  },
-  purge: function(statusCode = 0) {
+  }
+
+  purge(statusCode = 0) {
     [...this.connections].forEach(function(connection) {
       // Cancelled
       connection.abort(statusCode);
     });
     this.connections = new Set();
-  },
-  acquire: function(request) {
+  }
+
+  acquire(request) {
     if (this.connections.size >= this.env.var('CONSUL_HTTP_MAX_CONNECTIONS')) {
       const closed = this.data.closed();
       let connection = [...this.connections].find(item => {
@@ -79,8 +89,9 @@ export default Service.extend({
       }
     }
     this.connections.add(request);
-  },
-  release: function(request) {
+  }
+
+  release(request) {
     this.connections.delete(request);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/client/http.js b/ui/packages/consul-ui/app/services/client/http.js
index c21f2588a..365b7f12c 100644
--- a/ui/packages/consul-ui/app/services/client/http.js
+++ b/ui/packages/consul-ui/app/services/client/http.js
@@ -71,26 +71,38 @@ const parseBody = function(strs, ...values) {
 };
 
 const CLIENT_HEADERS = [CACHE_CONTROL, 'X-Request-ID', 'X-Range', 'Refresh'];
-export default Service.extend({
-  dom: service('dom'),
-  connections: service('client/connections'),
-  transport: service('client/transports/xhr'),
-  settings: service('settings'),
-  init: function() {
-    this._super(...arguments);
+export default class HttpService extends Service {
+  @service('dom')
+  dom;
+
+  @service('client/connections')
+  connections;
+
+  @service('client/transports/xhr')
+  transport;
+
+  @service('settings')
+  settings;
+
+  init() {
+    super.init(...arguments);
     this._listeners = this.dom.listeners();
-  },
-  willDestroy: function() {
+  }
+
+  willDestroy() {
     this._listeners.remove();
-    this._super(...arguments);
-  },
-  url: function() {
+    super.willDestroy(...arguments);
+  }
+
+  url() {
     return parseURL(...arguments);
-  },
-  body: function() {
+  }
+
+  body() {
     return parseBody(...arguments);
-  },
-  requestParams: function(strs, ...values) {
+  }
+
+  requestParams(strs, ...values) {
     // first go to the end and remove/parse the http body
     const [body, ...urlVars] = this.body(...arguments);
     // with whats left get the method off the front
@@ -151,8 +163,9 @@ export default Service.extend({
     // also see https://github.com/hashicorp/consul/issues/3804
     params.headers[CONTENT_TYPE] = 'application/json; charset=utf-8';
     return params;
-  },
-  fetchWithToken: function(path, params) {
+  }
+
+  fetchWithToken(path, params) {
     return this.settings.findBySlug('token').then(token => {
       return fetch(`${path}`, {
         ...params,
@@ -162,8 +175,9 @@ export default Service.extend({
         },
       });
     });
-  },
-  request: function(cb) {
+  }
+
+  request(cb) {
     const client = this;
     return cb(function(strs, ...values) {
       const params = client.requestParams(...arguments);
@@ -208,17 +222,21 @@ export default Service.extend({
         });
       });
     });
-  },
-  whenAvailable: function(e) {
+  }
+
+  whenAvailable(e) {
     return this.connections.whenAvailable(e);
-  },
-  abort: function() {
+  }
+
+  abort() {
     return this.connections.purge(...arguments);
-  },
-  acquire: function() {
+  }
+
+  acquire() {
     return this.connections.acquire(...arguments);
-  },
-  release: function() {
+  }
+
+  release() {
     return this.connections.release(...arguments);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/client/transports/xhr.js b/ui/packages/consul-ui/app/services/client/transports/xhr.js
index 0f3a6f3f8..5040e6478 100644
--- a/ui/packages/consul-ui/app/services/client/transports/xhr.js
+++ b/ui/packages/consul-ui/app/services/client/transports/xhr.js
@@ -7,11 +7,12 @@ import HTTPError from 'consul-ui/utils/http/error';
 
 const xhr = createXHR(createHeaders());
 
-export default Service.extend({
-  xhr: function(options) {
+export default class XhrService extends Service {
+  xhr(options) {
     return xhr(options);
-  },
-  request: function(params) {
+  }
+
+  request(params) {
     const request = new Request(params.method, params.url, {
       ['x-request-id']: params.clientHeaders['x-request-id'],
       body: params.data || {},
@@ -57,5 +58,5 @@ export default Service.extend({
       return request;
     };
     return request;
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/clipboard/local-storage.js b/ui/packages/consul-ui/app/services/clipboard/local-storage.js
index 7e30d4348..01eacb74f 100644
--- a/ui/packages/consul-ui/app/services/clipboard/local-storage.js
+++ b/ui/packages/consul-ui/app/services/clipboard/local-storage.js
@@ -16,12 +16,13 @@ class ClipboardCallback extends Clipboard {
   }
 }
 
-export default Service.extend({
-  storage: window.localStorage,
-  key: 'clipboard',
-  execute: function(trigger) {
+export default class LocalStorageService extends Service {
+  storage = window.localStorage;
+  key = 'clipboard';
+
+  execute(trigger) {
     return new ClipboardCallback(trigger, val => {
       this.storage.setItem(this.key, val);
     });
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/clipboard/os.js b/ui/packages/consul-ui/app/services/clipboard/os.js
index e51f37007..10a6dba8a 100644
--- a/ui/packages/consul-ui/app/services/clipboard/os.js
+++ b/ui/packages/consul-ui/app/services/clipboard/os.js
@@ -2,8 +2,8 @@ import Service from '@ember/service';
 
 import Clipboard from 'clipboard';
 
-export default Service.extend({
-  execute: function(trigger) {
+export default class OsService extends Service {
+  execute(trigger) {
     return new Clipboard(trigger);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/code-mirror/linter.js b/ui/packages/consul-ui/app/services/code-mirror/linter.js
index 9623af801..c89ba0b95 100644
--- a/ui/packages/consul-ui/app/services/code-mirror/linter.js
+++ b/ui/packages/consul-ui/app/services/code-mirror/linter.js
@@ -18,15 +18,19 @@ const MODES = [
   { name: 'YAML', mime: 'text/x-yaml', mode: 'yaml', ext: ['yaml', 'yml'], alias: ['yml'] },
 ];
 
-export default Service.extend({
-  dom: service('dom'),
-  modes: function() {
+export default class LinterService extends Service {
+  @service('dom')
+  dom;
+
+  modes() {
     return MODES;
-  },
-  lint: function() {
+  }
+
+  lint() {
     return lint(...arguments);
-  },
-  getEditor: function(element) {
+  }
+
+  getEditor(element) {
     return this.dom.element('textarea + div', element).CodeMirror;
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/data-sink/protocols/http.js b/ui/packages/consul-ui/app/services/data-sink/protocols/http.js
index 3383bd6b7..21c1b86af 100644
--- a/ui/packages/consul-ui/app/services/data-sink/protocols/http.js
+++ b/ui/packages/consul-ui/app/services/data-sink/protocols/http.js
@@ -1,22 +1,32 @@
 import Service, { inject as service } from '@ember/service';
 import { setProperties } from '@ember/object';
 
-export default Service.extend({
-  settings: service('settings'),
-  intention: service('repository/intention'),
-  kv: service('repository/kv'),
-  session: service('repository/session'),
-  prepare: function(sink, data, instance) {
+export default class HttpService extends Service {
+  @service('settings')
+  settings;
+
+  @service('repository/intention')
+  intention;
+
+  @service('repository/kv')
+  kv;
+
+  @service('repository/session')
+  session;
+
+  prepare(sink, data, instance) {
     return setProperties(instance, data);
-  },
-  persist: function(sink, instance) {
+  }
+
+  persist(sink, instance) {
     const [, , , model] = sink.split('/');
     const repo = this[model];
     return repo.persist(instance);
-  },
-  remove: function(sink, instance) {
+  }
+
+  remove(sink, instance) {
     const [, , , model] = sink.split('/');
     const repo = this[model];
     return repo.remove(instance);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/data-sink/protocols/local-storage.js b/ui/packages/consul-ui/app/services/data-sink/protocols/local-storage.js
index 797fd9e2b..5f26157c1 100644
--- a/ui/packages/consul-ui/app/services/data-sink/protocols/local-storage.js
+++ b/ui/packages/consul-ui/app/services/data-sink/protocols/local-storage.js
@@ -1,24 +1,28 @@
 import Service, { inject as service } from '@ember/service';
 import { setProperties } from '@ember/object';
 
-export default Service.extend({
-  settings: service('settings'),
-  prepare: function(sink, data, instance = {}) {
+export default class LocalStorageService extends Service {
+  @service('settings')
+  settings;
+
+  prepare(sink, data, instance = {}) {
     if (data === null || data === '') {
       return instance;
     }
     return setProperties(instance, data);
-  },
-  persist: function(sink, instance) {
+  }
+
+  persist(sink, instance) {
     const slug = sink.split(':').pop();
     const repo = this.settings;
     return repo.persist({
       [slug]: instance,
     });
-  },
-  remove: function(sink, instance) {
+  }
+
+  remove(sink, instance) {
     const slug = sink.split(':').pop();
     const repo = this.settings;
     return repo.delete(slug);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/data-sink/service.js b/ui/packages/consul-ui/app/services/data-sink/service.js
index afadc0fe3..31b051252 100644
--- a/ui/packages/consul-ui/app/services/data-sink/service.js
+++ b/ui/packages/consul-ui/app/services/data-sink/service.js
@@ -6,23 +6,28 @@ const parts = function(uri) {
   }
   return uri.split('://');
 };
-export default Service.extend({
-  consul: service('data-sink/protocols/http'),
-  settings: service('data-sink/protocols/local-storage'),
+export default class DataSinkService extends Service {
+  @service('data-sink/protocols/http')
+  consul;
 
-  prepare: function(uri, data, assign) {
+  @service('data-sink/protocols/local-storage')
+  settings;
+
+  prepare(uri, data, assign) {
     const [providerName, pathname] = parts(uri);
     const provider = this[providerName];
     return provider.prepare(pathname, data, assign);
-  },
-  persist: function(uri, data) {
+  }
+
+  persist(uri, data) {
     const [providerName, pathname] = parts(uri);
     const provider = this[providerName];
     return provider.persist(pathname, data);
-  },
-  remove: function(uri, data) {
+  }
+
+  remove(uri, data) {
     const [providerName, pathname] = parts(uri);
     const provider = this[providerName];
     return provider.remove(pathname, data);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/data-source/protocols/http.js b/ui/packages/consul-ui/app/services/data-source/protocols/http.js
index 66ebd4f33..3798a5f7d 100644
--- a/ui/packages/consul-ui/app/services/data-source/protocols/http.js
+++ b/ui/packages/consul-ui/app/services/data-source/protocols/http.js
@@ -1,36 +1,86 @@
 import Service, { inject as service } from '@ember/service';
 import { get } from '@ember/object';
 
-export default Service.extend({
-  datacenters: service('repository/dc'),
-  nodes: service('repository/node'),
-  node: service('repository/node'),
-  leader: service('repository/node'),
-  gateways: service('repository/service'),
-  services: service('repository/service'),
-  service: service('repository/service'),
-  ['service-instance']: service('repository/service-instance'),
-  ['service-instances']: service('repository/service-instance'),
-  proxies: service('repository/proxy'),
-  ['proxy-instance']: service('repository/proxy'),
-  ['discovery-chain']: service('repository/discovery-chain'),
-  ['topology']: service('repository/topology'),
-  coordinates: service('repository/coordinate'),
-  sessions: service('repository/session'),
-  namespaces: service('repository/nspace'),
-  intentions: service('repository/intention'),
-  intention: service('repository/intention'),
-  kv: service('repository/kv'),
-  token: service('repository/token'),
-  policies: service('repository/policy'),
-  policy: service('repository/policy'),
-  roles: service('repository/role'),
-  oidc: service('repository/oidc-provider'),
-  metrics: service('repository/metrics'),
+export default class HttpService extends Service {
+  @service('repository/dc')
+  datacenters;
 
-  type: service('data-source/protocols/http/blocking'),
+  @service('repository/node')
+  nodes;
 
-  source: function(src, configuration) {
+  @service('repository/node')
+  node;
+
+  @service('repository/node')
+  leader;
+
+  @service('repository/service')
+  gateways;
+
+  @service('repository/service')
+  services;
+
+  @service('repository/service')
+  service;
+
+  @service('repository/service-instance')
+  'service-instance';
+
+  @service('repository/service-instance')
+  'service-instances';
+
+  @service('repository/proxy')
+  proxies;
+
+  @service('repository/proxy')
+  'proxy-instance';
+
+  @service('repository/discovery-chain')
+  'discovery-chain';
+
+  @service('repository/topology')
+  topology;
+
+  @service('repository/coordinate')
+  coordinates;
+
+  @service('repository/session')
+  sessions;
+
+  @service('repository/nspace')
+  namespaces;
+
+  @service('repository/intention')
+  intentions;
+
+  @service('repository/intention')
+  intention;
+
+  @service('repository/kv')
+  kv;
+
+  @service('repository/token')
+  token;
+
+  @service('repository/policy')
+  policies;
+
+  @service('repository/policy')
+  policy;
+
+  @service('repository/role')
+  roles;
+
+  @service('repository/oidc-provider')
+  oidc;
+
+  @service('repository/metrics')
+  metrics;
+
+  @service('data-source/protocols/http/blocking')
+  type;
+
+  source(src, configuration) {
     // TODO: Consider adding/requiring 'action': nspace, dc, model, action, ...rest
     const [, nspace, dc, model, ...rest] = src.split('/').map(decodeURIComponent);
     // nspaces can be filled, blank or *
@@ -179,5 +229,5 @@ export default Service.extend({
         break;
     }
     return this.type.source(find, configuration);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/data-source/protocols/http/blocking.js b/ui/packages/consul-ui/app/services/data-source/protocols/http/blocking.js
index 3026aad98..b315d77e0 100644
--- a/ui/packages/consul-ui/app/services/data-source/protocols/http/blocking.js
+++ b/ui/packages/consul-ui/app/services/data-source/protocols/http/blocking.js
@@ -6,10 +6,14 @@ import { ifNotBlocking } from 'consul-ui/services/settings';
 import { restartWhenAvailable } from 'consul-ui/services/client/http';
 import maybeCall from 'consul-ui/utils/maybe-call';
 
-export default Service.extend({
-  client: service('client/http'),
-  settings: service('settings'),
-  source: function(find, configuration) {
+export default class BlockingService extends Service {
+  @service('client/http')
+  client;
+
+  @service('settings')
+  settings;
+
+  source(find, configuration) {
     return new EventSource((configuration, source) => {
       const close = source.close.bind(source);
       const deleteCursor = () => (configuration.cursor = undefined);
@@ -27,5 +31,5 @@ export default Service.extend({
           .catch(restartWhenAvailable(this.client));
       });
     }, configuration);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/data-source/protocols/http/promise.js b/ui/packages/consul-ui/app/services/data-source/protocols/http/promise.js
index cc1d55c00..53a21b7da 100644
--- a/ui/packages/consul-ui/app/services/data-source/protocols/http/promise.js
+++ b/ui/packages/consul-ui/app/services/data-source/protocols/http/promise.js
@@ -1,8 +1,8 @@
 import Service from '@ember/service';
 import { once } from 'consul-ui/utils/dom/event-source';
 
-export default Service.extend({
-  source: function(find, configuration) {
+export default class PromiseService extends Service {
+  source(find, configuration) {
     return once(find, configuration);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/data-source/protocols/local-storage.js b/ui/packages/consul-ui/app/services/data-source/protocols/local-storage.js
index 805d94b4c..e7046c82f 100644
--- a/ui/packages/consul-ui/app/services/data-source/protocols/local-storage.js
+++ b/ui/packages/consul-ui/app/services/data-source/protocols/local-storage.js
@@ -1,9 +1,11 @@
 import Service, { inject as service } from '@ember/service';
 import { StorageEventSource } from 'consul-ui/utils/dom/event-source';
 
-export default Service.extend({
-  repo: service('settings'),
-  source: function(src, configuration) {
+export default class LocalStorageService extends Service {
+  @service('settings')
+  repo;
+
+  source(src, configuration) {
     const slug = src.split(':').pop();
     return new StorageEventSource(
       configuration => {
@@ -14,5 +16,5 @@ export default Service.extend({
         uri: configuration.uri,
       }
     );
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/data-source/service.js b/ui/packages/consul-ui/app/services/data-source/service.js
index 1d56d295b..24b7d0462 100644
--- a/ui/packages/consul-ui/app/services/data-source/service.js
+++ b/ui/packages/consul-ui/app/services/data-source/service.js
@@ -11,23 +11,32 @@ let cache = null;
 let sources = null;
 // keeps a count of currently in use EventSources
 let usage = null;
-export default Service.extend({
-  dom: service('dom'),
-  encoder: service('encoder'),
-  consul: service('data-source/protocols/http'),
-  settings: service('data-source/protocols/local-storage'),
+export default class DataSourceService extends Service {
+  @service('dom')
+  dom;
 
-  init: function() {
-    this._super(...arguments);
+  @service('encoder')
+  encoder;
+
+  @service('data-source/protocols/http')
+  consul;
+
+  @service('data-source/protocols/local-storage')
+  settings;
+
+  init() {
+    super.init(...arguments);
     cache = new Map();
     sources = new Map();
     usage = new MultiMap(Set);
     this._listeners = this.dom.listeners();
-  },
-  resetCache: function() {
+  }
+
+  resetCache() {
     cache = new Map();
-  },
-  willDestroy: function() {
+  }
+
+  willDestroy() {
     this._listeners.remove();
     sources.forEach(function(item) {
       item.close();
@@ -36,8 +45,9 @@ export default Service.extend({
     sources = null;
     usage.clear();
     usage = null;
-  },
-  source: function(cb, attrs) {
+  }
+
+  source(cb, attrs) {
     const src = cb(this.encoder.uriTag());
     return new Promise((resolve, reject) => {
       const ref = {};
@@ -61,15 +71,17 @@ export default Service.extend({
         source.dispatchEvent(source.getCurrentEvent());
       }
     });
-  },
-  unwrap: function(src, ref) {
+  }
+
+  unwrap(src, ref) {
     const source = src._source;
     usage.set(source, ref);
     usage.remove(source, source.configuration.ref);
     delete source.configuration.ref;
     return source;
-  },
-  open: function(uri, ref, open = false) {
+  }
+
+  open(uri, ref, open = false) {
     if (typeof uri !== 'string') {
       return this.unwrap(uri, ref);
     }
@@ -131,8 +143,9 @@ export default Service.extend({
     // set/increase the usage counter
     usage.set(source, ref);
     return source;
-  },
-  close: function(source, ref) {
+  }
+
+  close(source, ref) {
     // this close is called when the source has either left the page
     // or in the case of a proxied source, it errors
     if (source) {
@@ -151,13 +164,14 @@ export default Service.extend({
         }
       }
     }
-  },
-  closed: function() {
+  }
+
+  closed() {
     // anything that is closed or closing
     return [...sources.entries()]
       .filter(([key, item]) => {
         return item.readyState > 1;
       })
       .map(item => item[0]);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/data-structs.js b/ui/packages/consul-ui/app/services/data-structs.js
index 7fa27f152..663c30fea 100644
--- a/ui/packages/consul-ui/app/services/data-structs.js
+++ b/ui/packages/consul-ui/app/services/data-structs.js
@@ -2,8 +2,8 @@ import Service from '@ember/service';
 
 import createGraph from 'ngraph.graph';
 
-export default Service.extend({
-  graph: function() {
+export default class DataStructsService extends Service {
+  graph() {
     return createGraph();
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/dom.js b/ui/packages/consul-ui/app/services/dom.js
index ae4582ffb..9f55bf936 100644
--- a/ui/packages/consul-ui/app/services/dom.js
+++ b/ui/packages/consul-ui/app/services/dom.js
@@ -23,35 +23,43 @@ const $$ = qsaFactory();
 let $_;
 let inViewportCallbacks;
 const clickFirstAnchor = clickFirstAnchorFactory(closest);
-export default Service.extend({
-  doc: document,
-  win: window,
-  init: function() {
-    this._super(...arguments);
+export default class DomService extends Service {
+  doc = document;
+  win = window;
+
+  init() {
+    super.init(...arguments);
     inViewportCallbacks = new WeakMap();
     $_ = getComponentFactory(getOwner(this));
-  },
-  willDestroy: function() {
-    this._super(...arguments);
+  }
+
+  willDestroy() {
+    super.willDestroy(...arguments);
     inViewportCallbacks = null;
     $_ = null;
-  },
-  document: function() {
+  }
+
+  document() {
     return this.doc;
-  },
-  viewport: function() {
+  }
+
+  viewport() {
     return this.win;
-  },
-  guid: function(el) {
+  }
+
+  guid(el) {
     return guidFor(el);
-  },
+  }
+
   // TODO: should this be here? Needs a better name at least
-  clickFirstAnchor: clickFirstAnchor,
-  closest: closest,
-  sibling: sibling,
-  isOutside: isOutside,
-  normalizeEvent: normalizeEvent,
-  setEventTargetProperty: function(e, property, cb) {
+  clickFirstAnchor = clickFirstAnchor;
+
+  closest = closest;
+  sibling = sibling;
+  isOutside = isOutside;
+  normalizeEvent = normalizeEvent;
+
+  setEventTargetProperty(e, property, cb) {
     const target = e.target;
     return new Proxy(e, {
       get: function(obj, prop, receiver) {
@@ -68,8 +76,9 @@ export default Service.extend({
         return Reflect.get(...arguments);
       },
     });
-  },
-  setEventTargetProperties: function(e, propObj) {
+  }
+
+  setEventTargetProperties(e, propObj) {
     const target = e.target;
     return new Proxy(e, {
       get: function(obj, prop, receiver) {
@@ -86,44 +95,52 @@ export default Service.extend({
         return Reflect.get(...arguments);
       },
     });
-  },
-  listeners: createListeners,
-  root: function() {
+  }
+
+  listeners = createListeners;
+
+  root() {
     return this.doc.documentElement;
-  },
+  }
+
   // TODO: Should I change these to use the standard names
   // even though they don't have a standard signature (querySelector*)
-  elementById: function(id) {
+  elementById(id) {
     return this.doc.getElementById(id);
-  },
-  elementsByTagName: function(name, context) {
+  }
+
+  elementsByTagName(name, context) {
     context = typeof context === 'undefined' ? this.doc : context;
     return context.getElementsByTagName(name);
-  },
-  elements: function(selector, context) {
+  }
+
+  elements(selector, context) {
     // don't ever be tempted to [...$$()] here
     // it should return a NodeList
     return $$(selector, context);
-  },
-  element: function(selector, context) {
+  }
+
+  element(selector, context) {
     if (selector.substr(0, 1) === '#') {
       return this.elementById(selector.substr(1));
     }
     // TODO: This can just use querySelector
     return [...$$(selector, context)][0];
-  },
+  }
+
   // ember components aren't strictly 'dom-like'
   // but if you think of them as a web component 'shim'
   // then it makes more sense to think of them as part of the dom
   // with traditional/standard web components you wouldn't actually need this
   // method as you could just get to their methods from the dom element
-  component: function(selector, context) {
+  component(selector, context) {
     if (typeof selector !== 'string') {
       return $_(selector);
     }
     return $_(this.element(selector, context));
-  },
-  components: function(selector, context) {
+  }
+
+  components(selector, context) {
     return [...this.elements(selector, context)]
       .map(function(item) {
         return $_(item);
@@ -131,8 +148,9 @@ export default Service.extend({
       .filter(function(item) {
         return item != null;
       });
-  },
-  isInViewport: function($el, cb, threshold = 0) {
+  }
+
+  isInViewport($el, cb, threshold = 0) {
     inViewportCallbacks.set($el, cb);
     let observer = new IntersectionObserver(
       (entries, observer) => {
@@ -158,5 +176,5 @@ export default Service.extend({
       observer.disconnect(); // eslint-disable-line ember/no-observers
       observer = null;
     };
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/encoder.js b/ui/packages/consul-ui/app/services/encoder.js
index 84917777f..c9a6c135b 100644
--- a/ui/packages/consul-ui/app/services/encoder.js
+++ b/ui/packages/consul-ui/app/services/encoder.js
@@ -2,26 +2,32 @@ import Service from '@ember/service';
 import atob from 'consul-ui/utils/atob';
 import btoa from 'consul-ui/utils/btoa';
 
-export default Service.extend({
-  uriComponent: encodeURIComponent,
-  atob: function() {
+export default class EncoderService extends Service {
+  uriComponent = encodeURIComponent;
+
+  atob() {
     return atob(...arguments);
-  },
-  btoa: function() {
+  }
+
+  btoa() {
     return btoa(...arguments);
-  },
-  uriJoin: function() {
+  }
+
+  uriJoin() {
     return this.joiner(this.uriComponent, '/', '')(...arguments);
-  },
-  uriTag: function() {
+  }
+
+  uriTag() {
     return this.tag(this.uriJoin.bind(this));
-  },
-  joiner: (encoder, joiner = '', defaultValue = '') => (values, strs) =>
+  }
+
+  joiner = (encoder, joiner = '', defaultValue = '') => (values, strs) =>
     (strs || Array(values.length).fill(joiner)).reduce(
       (prev, item, i) => `${prev}${item}${encoder(values[i] || defaultValue)}`,
       ''
-    ),
-  tag: function(join) {
+    );
+
+  tag(join) {
     return (strs, ...values) => join(values, strs);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/env.js b/ui/packages/consul-ui/app/services/env.js
index 544252723..fa25518b0 100644
--- a/ui/packages/consul-ui/app/services/env.js
+++ b/ui/packages/consul-ui/app/services/env.js
@@ -1,13 +1,14 @@
 import Service from '@ember/service';
 import { env } from 'consul-ui/env';
 
-export default Service.extend({
+export default class EnvService extends Service {
   // deprecated
   // TODO: Remove this elsewhere in the app and use var instead
-  env: function(key) {
+  env(key) {
     return env(key);
-  },
-  var: function(key) {
+  }
+
+  var(key) {
     return env(key);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/feedback.js b/ui/packages/consul-ui/app/services/feedback.js
index 8815192f2..1fe23e65d 100644
--- a/ui/packages/consul-ui/app/services/feedback.js
+++ b/ui/packages/consul-ui/app/services/feedback.js
@@ -12,10 +12,14 @@ const notificationDefaults = function() {
     extendedTimeout: 300,
   };
 };
-export default Service.extend({
-  notify: service('flashMessages'),
-  logger: service('logger'),
-  execute: function(handle, action, status = defaultStatus, controller) {
+export default class FeedbackService extends Service {
+  @service('flashMessages')
+  notify;
+
+  @service('logger')
+  logger;
+
+  execute(handle, action, status = defaultStatus, controller) {
     const getAction = callableType(action);
     const getStatus = callableType(status);
     const notify = this.notify;
@@ -58,5 +62,5 @@ export default Service.extend({
           }
         })
     );
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/filter.js b/ui/packages/consul-ui/app/services/filter.js
index 5123a617c..7b18a6849 100644
--- a/ui/packages/consul-ui/app/services/filter.js
+++ b/ui/packages/consul-ui/app/services/filter.js
@@ -16,8 +16,8 @@ const predicates = {
   policy: policy(),
 };
 
-export default Service.extend({
-  predicate: function(type) {
+export default class FilterService extends Service {
+  predicate(type) {
     return predicates[type];
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/form.js b/ui/packages/consul-ui/app/services/form.js
index 137abe76b..4e387d227 100644
--- a/ui/packages/consul-ui/app/services/form.js
+++ b/ui/packages/consul-ui/app/services/form.js
@@ -1,21 +1,27 @@
 import Service, { inject as service } from '@ember/service';
 import builderFactory from 'consul-ui/utils/form/builder';
 const builder = builderFactory();
-export default Service.extend({
+export default class FormService extends Service {
   // a `get` method is added via the form initializer
   // see initializers/form.js
 
   // TODO: Temporarily add these here until something else needs
   // dynamic repos
-  role: service('repository/role'),
-  policy: service('repository/policy'),
+  @service('repository/role')
+  role;
+
+  @service('repository/policy')
+  policy;
+
   //
-  init: function() {
-    this._super(...arguments);
+  init() {
+    super.init(...arguments);
     this.forms = [];
-  },
-  build: function(obj, name) {
+  }
+
+  build(obj, name) {
     return builder(...arguments);
-  },
-  form: function() {},
-});
+  }
+
+  form() {}
+}
diff --git a/ui/packages/consul-ui/app/services/lazy-proxy.js b/ui/packages/consul-ui/app/services/lazy-proxy.js
deleted file mode 100644
index 095d0b82e..000000000
--- a/ui/packages/consul-ui/app/services/lazy-proxy.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import Service from '@ember/service';
-
-export default Service.extend({
-  shouldProxy: function(content, method) {
-    return false;
-  },
-  init: function() {
-    this._super(...arguments);
-    const content = this.content;
-    for (let prop in content) {
-      if (typeof content[prop] === 'function') {
-        if (this.shouldProxy(content, prop)) {
-          this[prop] = function() {
-            const cb = this.execute(content, prop);
-            if (typeof cb.then !== 'undefined') {
-              return cb.then(method => {
-                return method.apply(this, arguments);
-              });
-            } else {
-              return cb.apply(this, arguments);
-            }
-          };
-        } else if (typeof this[prop] !== 'function') {
-          this[prop] = function() {
-            return content[prop](...arguments);
-          };
-        }
-      }
-    }
-  },
-});
diff --git a/ui/packages/consul-ui/app/services/logger.js b/ui/packages/consul-ui/app/services/logger.js
index e61252afe..8b4a73c24 100644
--- a/ui/packages/consul-ui/app/services/logger.js
+++ b/ui/packages/consul-ui/app/services/logger.js
@@ -1,8 +1,8 @@
 import Service from '@ember/service';
 import { runInDebug } from '@ember/debug';
 
-export default Service.extend({
-  execute: function(obj) {
+export default class LoggerService extends Service {
+  execute(obj) {
     runInDebug(() => {
       obj = typeof obj.error !== 'undefined' ? obj.error : obj;
       if (obj instanceof Error) {
@@ -11,5 +11,5 @@ export default Service.extend({
         console.log(obj); // eslint-disable-line no-console
       }
     });
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/repository.js b/ui/packages/consul-ui/app/services/repository.js
index 195022b88..a332e8325 100644
--- a/ui/packages/consul-ui/app/services/repository.js
+++ b/ui/packages/consul-ui/app/services/repository.js
@@ -4,19 +4,24 @@ import { typeOf } from '@ember/utils';
 import { get } from '@ember/object';
 import { isChangeset } from 'validated-changeset';
 
-export default Service.extend({
-  getModelName: function() {
+export default class RepositoryService extends Service {
+  getModelName() {
     assert('RepositoryService.getModelName should be overridden', false);
-  },
-  getPrimaryKey: function() {
+  }
+
+  getPrimaryKey() {
     assert('RepositoryService.getPrimaryKey should be overridden', false);
-  },
-  getSlugKey: function() {
+  }
+
+  getSlugKey() {
     assert('RepositoryService.getSlugKey should be overridden', false);
-  },
+  }
+
   //
-  store: service('store'),
-  reconcile: function(meta = {}) {
+  @service('store')
+  store;
+
+  reconcile(meta = {}) {
     // unload anything older than our current sync date/time
     if (typeof meta.date !== 'undefined') {
       const checkNspace = meta.nspace !== '';
@@ -36,11 +41,13 @@ export default Service.extend({
         }
       });
     }
-  },
-  peekOne: function(id) {
+  }
+
+  peekOne(id) {
     return this.store.peekRecord(this.getModelName(), id);
-  },
-  findAllByDatacenter: function(dc, nspace, configuration = {}) {
+  }
+
+  findAllByDatacenter(dc, nspace, configuration = {}) {
     const query = {
       dc: dc,
       ns: nspace,
@@ -50,8 +57,9 @@ export default Service.extend({
       query.uri = configuration.uri;
     }
     return this.store.query(this.getModelName(), query);
-  },
-  findBySlug: function(slug, dc, nspace, configuration = {}) {
+  }
+
+  findBySlug(slug, dc, nspace, configuration = {}) {
     const query = {
       dc: dc,
       ns: nspace,
@@ -62,12 +70,14 @@ export default Service.extend({
       query.uri = configuration.uri;
     }
     return this.store.queryRecord(this.getModelName(), query);
-  },
-  create: function(obj) {
+  }
+
+  create(obj) {
     // TODO: This should probably return a Promise
     return this.store.createRecord(this.getModelName(), obj);
-  },
-  persist: function(item) {
+  }
+
+  persist(item) {
     // workaround for saving changesets that contain fragments
     // firstly commit the changes down onto the object if
     // its a changeset, then save as a normal object
@@ -76,8 +86,9 @@ export default Service.extend({
       item = item.data;
     }
     return item.save();
-  },
-  remove: function(obj) {
+  }
+
+  remove(obj) {
     let item = obj;
     if (typeof obj.destroyRecord === 'undefined') {
       item = obj.get('data');
@@ -91,9 +102,10 @@ export default Service.extend({
     return item.destroyRecord().then(item => {
       return this.store.unloadRecord(item);
     });
-  },
-  invalidate: function() {
+  }
+
+  invalidate() {
     // TODO: This should probably return a Promise
     this.store.unloadAll(this.getModelName());
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/repository/acl.js b/ui/packages/consul-ui/app/services/repository/acl.js
index bdc9a557b..2f17409d7 100644
--- a/ui/packages/consul-ui/app/services/repository/acl.js
+++ b/ui/packages/consul-ui/app/services/repository/acl.js
@@ -2,14 +2,16 @@ import RepositoryService from 'consul-ui/services/repository';
 import { get } from '@ember/object';
 import { PRIMARY_KEY } from 'consul-ui/models/acl';
 const modelName = 'acl';
-export default RepositoryService.extend({
-  getModelName: function() {
+export default class AclService extends RepositoryService {
+  getModelName() {
     return modelName;
-  },
-  getPrimaryKey: function() {
+  }
+
+  getPrimaryKey() {
     return PRIMARY_KEY;
-  },
-  clone: function(item) {
+  }
+
+  clone(item) {
     return this.store.clone(this.getModelName(), get(item, this.getPrimaryKey()));
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/repository/coordinate.js b/ui/packages/consul-ui/app/services/repository/coordinate.js
index fa7623549..92b4ea9c3 100644
--- a/ui/packages/consul-ui/app/services/repository/coordinate.js
+++ b/ui/packages/consul-ui/app/services/repository/coordinate.js
@@ -6,13 +6,14 @@ import distance from 'consul-ui/utils/distance';
 const tomography = tomographyFactory(distance);
 
 const modelName = 'coordinate';
-export default RepositoryService.extend({
-  getModelName: function() {
+export default class CoordinateService extends RepositoryService {
+  getModelName() {
     return modelName;
-  },
+  }
+
   // Coordinates don't need nspaces so we have a custom method here
   // that doesn't accept nspaces
-  findAllByDatacenter: function(dc, configuration = {}) {
+  findAllByDatacenter(dc, configuration = {}) {
     const query = {
       dc: dc,
     };
@@ -21,8 +22,9 @@ export default RepositoryService.extend({
       query.uri = configuration.uri;
     }
     return this.store.query(this.getModelName(), query);
-  },
-  findAllByNode: function(node, dc, configuration) {
+  }
+
+  findAllByNode(node, dc, configuration) {
     return this.findAllByDatacenter(dc, configuration).then(function(coordinates) {
       let results = {};
       if (get(coordinates, 'length') > 1) {
@@ -34,5 +36,5 @@ export default RepositoryService.extend({
       results.meta = get(coordinates, 'meta');
       return results;
     });
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/repository/dc.js b/ui/packages/consul-ui/app/services/repository/dc.js
index e34379625..d919148a8 100644
--- a/ui/packages/consul-ui/app/services/repository/dc.js
+++ b/ui/packages/consul-ui/app/services/repository/dc.js
@@ -1,18 +1,22 @@
-import RepositoryService from 'consul-ui/services/repository';
 import { inject as service } from '@ember/service';
+import RepositoryService from 'consul-ui/services/repository';
 import { get } from '@ember/object';
 import Error from '@ember/error';
 
 const modelName = 'dc';
-export default RepositoryService.extend({
-  settings: service('settings'),
-  getModelName: function() {
+export default class DcService extends RepositoryService {
+  @service('settings')
+  settings;
+
+  getModelName() {
     return modelName;
-  },
-  findAll: function() {
+  }
+
+  findAll() {
     return this.store.query(this.getModelName(), {});
-  },
-  findBySlug: function(name, items) {
+  }
+
+  findBySlug(name, items) {
     if (name != null) {
       const item = items.findBy('Name', name);
       if (item) {
@@ -26,8 +30,9 @@ export default RepositoryService.extend({
     e.status = '404';
     e.detail = 'Page not found';
     return Promise.reject({ errors: [e] });
-  },
-  getActive: function(name, items) {
+  }
+
+  getActive(name, items) {
     const settings = this.settings;
     return Promise.all([name || settings.findBySlug('dc'), items || this.findAll()]).then(
       ([name, items]) => {
@@ -38,8 +43,9 @@ export default RepositoryService.extend({
         });
       }
     );
-  },
-  clearActive: function() {
+  }
+
+  clearActive() {
     return this.settings.delete('dc');
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/repository/discovery-chain.js b/ui/packages/consul-ui/app/services/repository/discovery-chain.js
index 704a42e54..0ce555872 100644
--- a/ui/packages/consul-ui/app/services/repository/discovery-chain.js
+++ b/ui/packages/consul-ui/app/services/repository/discovery-chain.js
@@ -4,17 +4,20 @@ import RepositoryService from 'consul-ui/services/repository';
 
 const modelName = 'discovery-chain';
 const ERROR_MESH_DISABLED = 'Connect must be enabled in order to use this endpoint';
-export default RepositoryService.extend({
-  dcs: service('repository/dc'),
-  getModelName: function() {
+export default class DiscoveryChainService extends RepositoryService {
+  @service('repository/dc')
+  dcs;
+
+  getModelName() {
     return modelName;
-  },
-  findBySlug: function(slug, dc, nspace, configuration = {}) {
+  }
+
+  findBySlug(slug, dc, nspace, configuration = {}) {
     const datacenter = this.dcs.peekOne(dc);
     if (datacenter !== null && !get(datacenter, 'MeshEnabled')) {
       return Promise.resolve();
     }
-    return this._super(...arguments).catch(e => {
+    return super.findBySlug(...arguments).catch(e => {
       const code = get(e, 'errors.firstObject.status');
       const body = get(e, 'errors.firstObject.detail').trim();
       switch (code) {
@@ -27,5 +30,5 @@ export default RepositoryService.extend({
           throw e;
       }
     });
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/repository/intention-permission-http-header.js b/ui/packages/consul-ui/app/services/repository/intention-permission-http-header.js
index 7fb1ee093..d3a8aecc7 100644
--- a/ui/packages/consul-ui/app/services/repository/intention-permission-http-header.js
+++ b/ui/packages/consul-ui/app/services/repository/intention-permission-http-header.js
@@ -1,14 +1,16 @@
 import RepositoryService from 'consul-ui/services/repository';
 
 const modelName = 'intention-permission-http-header';
-export default RepositoryService.extend({
-  getModelName: function() {
+export default class IntentionPermissionHttpHeaderService extends RepositoryService {
+  getModelName() {
     return modelName;
-  },
-  create: function(obj = {}) {
+  }
+
+  create(obj = {}) {
     return this.store.createFragment(this.getModelName(), obj);
-  },
-  persist: function(item) {
+  }
+
+  persist(item) {
     return item.execute();
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/repository/intention-permission.js b/ui/packages/consul-ui/app/services/repository/intention-permission.js
index 79e2c906f..aa4cbdda5 100644
--- a/ui/packages/consul-ui/app/services/repository/intention-permission.js
+++ b/ui/packages/consul-ui/app/services/repository/intention-permission.js
@@ -1,18 +1,20 @@
 import RepositoryService from 'consul-ui/services/repository';
 const modelName = 'intention-permission';
-export default RepositoryService.extend({
-  getModelName: function() {
+export default class IntentionPermissionService extends RepositoryService {
+  getModelName() {
     return modelName;
-  },
-  create: function(obj = {}) {
+  }
+
+  create(obj = {}) {
     // intention-permission and intention-permission-http
     // are currently treated as one and the same
     return this.store.createFragment(this.getModelName(), {
       ...obj,
       HTTP: this.store.createFragment('intention-permission-http', obj.HTTP || {}),
     });
-  },
-  persist: function(item) {
+  }
+
+  persist(item) {
     return item.execute();
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/repository/kv.js b/ui/packages/consul-ui/app/services/repository/kv.js
index fccd822d1..5d4e3c1eb 100644
--- a/ui/packages/consul-ui/app/services/repository/kv.js
+++ b/ui/packages/consul-ui/app/services/repository/kv.js
@@ -4,15 +4,17 @@ import { get } from '@ember/object';
 import { PRIMARY_KEY } from 'consul-ui/models/kv';
 
 const modelName = 'kv';
-export default RepositoryService.extend({
-  getModelName: function() {
+export default class KvService extends RepositoryService {
+  getModelName() {
     return modelName;
-  },
-  getPrimaryKey: function() {
+  }
+
+  getPrimaryKey() {
     return PRIMARY_KEY;
-  },
+  }
+
   // this one gives you the full object so key,values and meta
-  findBySlug: function(key, dc, nspace, configuration = {}) {
+  findBySlug(key, dc, nspace, configuration = {}) {
     if (isFolder(key)) {
       // TODO: This very much shouldn't be here,
       // needs to eventually use ember-datas generateId thing
@@ -37,10 +39,11 @@ export default RepositoryService.extend({
       query.index = configuration.cursor;
     }
     return this.store.queryRecord(this.getModelName(), query);
-  },
+  }
+
   // this one only gives you keys
   // https://www.consul.io/api/kv.html
-  findAllBySlug: function(key, dc, nspace, configuration = {}) {
+  findAllBySlug(key, dc, nspace, configuration = {}) {
     if (key === '/') {
       key = '';
     }
@@ -76,5 +79,5 @@ export default RepositoryService.extend({
         }
         throw e;
       });
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/repository/metrics.js b/ui/packages/consul-ui/app/services/repository/metrics.js
index da2561b1f..eab5a3dcc 100644
--- a/ui/packages/consul-ui/app/services/repository/metrics.js
+++ b/ui/packages/consul-ui/app/services/repository/metrics.js
@@ -1,5 +1,5 @@
-import RepositoryService from 'consul-ui/services/repository';
 import { inject as service } from '@ember/service';
+import RepositoryService from 'consul-ui/services/repository';
 import { env } from 'consul-ui/env';
 
 // meta is used by DataSource to configure polling. The interval controls how
@@ -9,13 +9,17 @@ const meta = {
   interval: env('CONSUL_METRICS_POLL_INTERVAL') || 10000,
 };
 
-export default RepositoryService.extend({
-  cfg: service('ui-config'),
-  client: service('client/http'),
-  error: null,
+export default class MetricsService extends RepositoryService {
+  @service('ui-config')
+  cfg;
 
-  init: function() {
-    this._super(...arguments);
+  @service('client/http')
+  client;
+
+  error = null;
+
+  init() {
+    super.init(...arguments);
     const uiCfg = this.cfg.get();
     // Inject whether or not the proxy is enabled as an option into the opaque
     // JSON options the user provided.
@@ -35,9 +39,9 @@ export default RepositoryService.extend({
       // Dev.
       console.error(this.error); // eslint-disable-line no-console
     }
-  },
+  }
 
-  findServiceSummary: function(protocol, slug, dc, nspace, configuration = {}) {
+  findServiceSummary(protocol, slug, dc, nspace, configuration = {}) {
     if (this.error) {
       return Promise.reject(this.error);
     }
@@ -52,9 +56,9 @@ export default RepositoryService.extend({
         stats: results[1].stats,
       };
     });
-  },
+  }
 
-  findUpstreamSummary: function(slug, dc, nspace, configuration = {}) {
+  findUpstreamSummary(slug, dc, nspace, configuration = {}) {
     if (this.error) {
       return Promise.reject(this.error);
     }
@@ -62,9 +66,9 @@ export default RepositoryService.extend({
       result.meta = meta;
       return result;
     });
-  },
+  }
 
-  findDownstreamSummary: function(slug, dc, nspace, configuration = {}) {
+  findDownstreamSummary(slug, dc, nspace, configuration = {}) {
     if (this.error) {
       return Promise.reject(this.error);
     }
@@ -72,5 +76,5 @@ export default RepositoryService.extend({
       result.meta = meta;
       return result;
     });
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/repository/node.js b/ui/packages/consul-ui/app/services/repository/node.js
index 26ca7c894..7b557f4ea 100644
--- a/ui/packages/consul-ui/app/services/repository/node.js
+++ b/ui/packages/consul-ui/app/services/repository/node.js
@@ -1,11 +1,12 @@
 import RepositoryService from 'consul-ui/services/repository';
 
 const modelName = 'node';
-export default RepositoryService.extend({
-  getModelName: function() {
+export default class NodeService extends RepositoryService {
+  getModelName() {
     return modelName;
-  },
-  findLeader: function(dc, configuration = {}) {
+  }
+
+  findLeader(dc, configuration = {}) {
     const query = {
       dc: dc,
     };
@@ -13,5 +14,5 @@ export default RepositoryService.extend({
       query.uri = configuration.uri;
     }
     return this.store.queryLeader(this.getModelName(), query);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/repository/nspace.js b/ui/packages/consul-ui/app/services/repository/nspace.js
index 040b1b804..da962e2f9 100644
--- a/ui/packages/consul-ui/app/services/repository/nspace.js
+++ b/ui/packages/consul-ui/app/services/repository/nspace.js
@@ -2,17 +2,20 @@ import RepositoryService from 'consul-ui/services/repository';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/nspace';
 
 const modelName = 'nspace';
-export default RepositoryService.extend({
-  getPrimaryKey: function() {
+export default class NspaceService extends RepositoryService {
+  getPrimaryKey() {
     return PRIMARY_KEY;
-  },
-  getSlugKey: function() {
+  }
+
+  getSlugKey() {
     return SLUG_KEY;
-  },
-  getModelName: function() {
+  }
+
+  getModelName() {
     return modelName;
-  },
-  remove: function(item) {
+  }
+
+  remove(item) {
     // Namespace deletion is more of a soft delete.
     // Therefore the namespace still exists once we've requested a delete/removal.
     // This makes 'removing' more of a custom action rather than a standard
@@ -32,13 +35,14 @@ export default RepositoryService.extend({
       'nspace'
     );
     return res;
-  },
-  findAll: function(configuration = {}) {
+  }
+
+  findAll(configuration = {}) {
     const query = {};
     if (typeof configuration.cursor !== 'undefined') {
       query.index = configuration.cursor;
       query.uri = configuration.uri;
     }
     return this.store.query(this.getModelName(), query);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/repository/nspace/disabled.js b/ui/packages/consul-ui/app/services/repository/nspace/disabled.js
index 50e4af710..68437a427 100644
--- a/ui/packages/consul-ui/app/services/repository/nspace/disabled.js
+++ b/ui/packages/consul-ui/app/services/repository/nspace/disabled.js
@@ -3,25 +3,30 @@ import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/nspace';
 
 const modelName = 'nspace';
 const DEFAULT_NSPACE = 'default';
-export default RepositoryService.extend({
-  getPrimaryKey: function() {
+export default class DisabledService extends RepositoryService {
+  getPrimaryKey() {
     return PRIMARY_KEY;
-  },
-  getSlugKey: function() {
+  }
+
+  getSlugKey() {
     return SLUG_KEY;
-  },
-  getModelName: function() {
+  }
+
+  getModelName() {
     return modelName;
-  },
-  findAll: function(configuration = {}) {
+  }
+
+  findAll(configuration = {}) {
     return Promise.resolve([]);
-  },
-  getActive: function() {
+  }
+
+  getActive() {
     return {
       Name: DEFAULT_NSPACE,
     };
-  },
-  authorize: function(dc, nspace) {
+  }
+
+  authorize(dc, nspace) {
     return Promise.resolve([]);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/repository/nspace/enabled.js b/ui/packages/consul-ui/app/services/repository/nspace/enabled.js
index ec05fa1bf..8239c6346 100644
--- a/ui/packages/consul-ui/app/services/repository/nspace/enabled.js
+++ b/ui/packages/consul-ui/app/services/repository/nspace/enabled.js
@@ -5,27 +5,35 @@ import RepositoryService from 'consul-ui/services/repository';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/nspace';
 
 const modelName = 'nspace';
-export default RepositoryService.extend({
-  router: service('router'),
-  settings: service('settings'),
-  getPrimaryKey: function() {
+export default class EnabledService extends RepositoryService {
+  @service('router')
+  router;
+
+  @service('settings')
+  settings;
+
+  getPrimaryKey() {
     return PRIMARY_KEY;
-  },
-  getSlugKey: function() {
+  }
+
+  getSlugKey() {
     return SLUG_KEY;
-  },
-  getModelName: function() {
+  }
+
+  getModelName() {
     return modelName;
-  },
-  findAll: function(configuration = {}) {
+  }
+
+  findAll(configuration = {}) {
     const query = {};
     if (typeof configuration.cursor !== 'undefined') {
       query.index = configuration.cursor;
       query.uri = configuration.uri;
     }
     return this.store.query(this.getModelName(), query);
-  },
-  authorize: function(dc, nspace) {
+  }
+
+  authorize(dc, nspace) {
     if (!env('CONSUL_ACLS_ENABLED')) {
       return Promise.resolve([
         {
@@ -38,8 +46,9 @@ export default RepositoryService.extend({
     return this.store.authorize(this.getModelName(), { dc: dc, ns: nspace }).catch(function(e) {
       return [];
     });
-  },
-  getActive: function() {
+  }
+
+  getActive() {
     let routeParams = {};
     // this is only populated before the model hook as fired,
     // it is then deleted after the model hook has finished
@@ -77,5 +86,5 @@ export default RepositoryService.extend({
           Name: item.nspace.substr(1),
         };
       });
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/repository/oidc-provider.js b/ui/packages/consul-ui/app/services/repository/oidc-provider.js
index ac8db7d9c..77907013c 100644
--- a/ui/packages/consul-ui/app/services/repository/oidc-provider.js
+++ b/ui/packages/consul-ui/app/services/repository/oidc-provider.js
@@ -1,20 +1,24 @@
-import RepositoryService from 'consul-ui/services/repository';
 import { inject as service } from '@ember/service';
+import RepositoryService from 'consul-ui/services/repository';
 import { getOwner } from '@ember/application';
 import { set } from '@ember/object';
 
 const modelName = 'oidc-provider';
 const OAUTH_PROVIDER_NAME = 'oidc-with-url';
-export default RepositoryService.extend({
-  manager: service('torii'),
-  init: function() {
-    this._super(...arguments);
+export default class OidcProviderService extends RepositoryService {
+  @service('torii')
+  manager;
+
+  init() {
+    super.init(...arguments);
     this.provider = getOwner(this).lookup(`torii-provider:${OAUTH_PROVIDER_NAME}`);
-  },
-  getModelName: function() {
+  }
+
+  getModelName() {
     return modelName;
-  },
-  authorize: function(id, code, state, dc, nspace, configuration = {}) {
+  }
+
+  authorize(id, code, state, dc, nspace, configuration = {}) {
     const query = {
       id: id,
       code: code,
@@ -23,8 +27,9 @@ export default RepositoryService.extend({
       ns: nspace,
     };
     return this.store.authorize(this.getModelName(), query);
-  },
-  logout: function(id, code, state, dc, nspace, configuration = {}) {
+  }
+
+  logout(id, code, state, dc, nspace, configuration = {}) {
     // TODO: Temporarily call this secret, as we alreayd do that with
     // self in the `store` look to see whether we should just call it id like
     // the rest
@@ -32,11 +37,13 @@ export default RepositoryService.extend({
       id: id,
     };
     return this.store.logout(this.getModelName(), query);
-  },
-  close: function() {
+  }
+
+  close() {
     this.manager.close(OAUTH_PROVIDER_NAME);
-  },
-  findCodeByURL: function(src) {
+  }
+
+  findCodeByURL(src) {
     // TODO: Maybe move this to the provider itself
     set(this.provider, 'baseUrl', src);
     return this.manager.open(OAUTH_PROVIDER_NAME, {}).catch(e => {
@@ -52,5 +59,5 @@ export default RepositoryService.extend({
       }
       this.store.adapterFor(this.getModelName()).error(err);
     });
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/repository/policy.js b/ui/packages/consul-ui/app/services/repository/policy.js
index 59ed5a89a..57c4dedbe 100644
--- a/ui/packages/consul-ui/app/services/repository/policy.js
+++ b/ui/packages/consul-ui/app/services/repository/policy.js
@@ -8,20 +8,24 @@ const isValidServerError = isValidServerErrorFactory();
 const status = statusFactory(isValidServerError, Promise);
 const MODEL_NAME = 'policy';
 
-export default RepositoryService.extend({
-  getModelName: function() {
+export default class PolicyService extends RepositoryService {
+  getModelName() {
     return MODEL_NAME;
-  },
-  getPrimaryKey: function() {
+  }
+
+  getPrimaryKey() {
     return PRIMARY_KEY;
-  },
-  getSlugKey: function() {
+  }
+
+  getSlugKey() {
     return SLUG_KEY;
-  },
-  status: function(obj) {
+  }
+
+  status(obj) {
     return status(obj);
-  },
-  persist: function(item) {
+  }
+
+  persist(item) {
     // only if a policy doesn't have a template, save it
     // right now only ServiceIdentities have templates and
     // are not saveable themselves (but can be saved to a Role/Token)
@@ -30,8 +34,9 @@ export default RepositoryService.extend({
         return item.save();
     }
     return Promise.resolve(item);
-  },
-  translate: function(item) {
+  }
+
+  translate(item) {
     return this.store.translate('policy', get(item, 'Rules'));
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/repository/proxy.js b/ui/packages/consul-ui/app/services/repository/proxy.js
index 9e20745dd..e0fa74143 100644
--- a/ui/packages/consul-ui/app/services/repository/proxy.js
+++ b/ui/packages/consul-ui/app/services/repository/proxy.js
@@ -2,14 +2,16 @@ import RepositoryService from 'consul-ui/services/repository';
 import { PRIMARY_KEY } from 'consul-ui/models/proxy';
 import { get, set } from '@ember/object';
 const modelName = 'proxy';
-export default RepositoryService.extend({
-  getModelName: function() {
+export default class ProxyService extends RepositoryService {
+  getModelName() {
     return modelName;
-  },
-  getPrimaryKey: function() {
+  }
+
+  getPrimaryKey() {
     return PRIMARY_KEY;
-  },
-  findAllBySlug: function(slug, dc, nspace, configuration = {}) {
+  }
+
+  findAllBySlug(slug, dc, nspace, configuration = {}) {
     const query = {
       id: slug,
       ns: nspace,
@@ -33,8 +35,9 @@ export default RepositoryService.extend({
       });
       return items;
     });
-  },
-  findInstanceBySlug: function(id, node, slug, dc, nspace, configuration) {
+  }
+
+  findInstanceBySlug(id, node, slug, dc, nspace, configuration) {
     return this.findAllBySlug(slug, dc, nspace, configuration).then(function(items) {
       let res = {};
       if (get(items, 'length') > 0) {
@@ -51,5 +54,5 @@ export default RepositoryService.extend({
       set(res, 'meta', get(items, 'meta'));
       return res;
     });
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/repository/role.js b/ui/packages/consul-ui/app/services/repository/role.js
index 942b7f288..6c40c3929 100644
--- a/ui/packages/consul-ui/app/services/repository/role.js
+++ b/ui/packages/consul-ui/app/services/repository/role.js
@@ -7,17 +7,20 @@ const isValidServerError = isValidServerErrorFactory();
 const status = statusFactory(isValidServerError, Promise);
 const MODEL_NAME = 'role';
 
-export default RepositoryService.extend({
-  getModelName: function() {
+export default class RoleService extends RepositoryService {
+  getModelName() {
     return MODEL_NAME;
-  },
-  getPrimaryKey: function() {
+  }
+
+  getPrimaryKey() {
     return PRIMARY_KEY;
-  },
-  getSlugKey: function() {
+  }
+
+  getSlugKey() {
     return SLUG_KEY;
-  },
-  status: function(obj) {
+  }
+
+  status(obj) {
     return status(obj);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/repository/service-instance.js b/ui/packages/consul-ui/app/services/repository/service-instance.js
index 737f366e4..31ec872f1 100644
--- a/ui/packages/consul-ui/app/services/repository/service-instance.js
+++ b/ui/packages/consul-ui/app/services/repository/service-instance.js
@@ -1,10 +1,11 @@
 import RepositoryService from 'consul-ui/services/repository';
 const modelName = 'service-instance';
-export default RepositoryService.extend({
-  getModelName: function() {
+export default class ServiceInstanceService extends RepositoryService {
+  getModelName() {
     return modelName;
-  },
-  findByService: function(slug, dc, nspace, configuration = {}) {
+  }
+
+  findByService(slug, dc, nspace, configuration = {}) {
     const query = {
       dc: dc,
       ns: nspace,
@@ -15,8 +16,9 @@ export default RepositoryService.extend({
       query.uri = configuration.uri;
     }
     return this.store.query(this.getModelName(), query);
-  },
-  findBySlug: function(serviceId, node, service, dc, nspace, configuration = {}) {
+  }
+
+  findBySlug(serviceId, node, service, dc, nspace, configuration = {}) {
     const query = {
       dc: dc,
       ns: nspace,
@@ -29,5 +31,5 @@ export default RepositoryService.extend({
       query.uri = configuration.uri;
     }
     return this.store.queryRecord(this.getModelName(), query);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/repository/service.js b/ui/packages/consul-ui/app/services/repository/service.js
index 1a1d9d903..b804b486b 100644
--- a/ui/packages/consul-ui/app/services/repository/service.js
+++ b/ui/packages/consul-ui/app/services/repository/service.js
@@ -1,10 +1,11 @@
 import RepositoryService from 'consul-ui/services/repository';
 const modelName = 'service';
-export default RepositoryService.extend({
-  getModelName: function() {
+export default class _RepositoryService extends RepositoryService {
+  getModelName() {
     return modelName;
-  },
-  findGatewayBySlug: function(slug, dc, nspace, configuration = {}) {
+  }
+
+  findGatewayBySlug(slug, dc, nspace, configuration = {}) {
     const query = {
       dc: dc,
       ns: nspace,
@@ -15,5 +16,5 @@ export default RepositoryService.extend({
       query.uri = configuration.uri;
     }
     return this.store.query(this.getModelName(), query);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/repository/session.js b/ui/packages/consul-ui/app/services/repository/session.js
index aa96584da..bc98df92d 100644
--- a/ui/packages/consul-ui/app/services/repository/session.js
+++ b/ui/packages/consul-ui/app/services/repository/session.js
@@ -1,13 +1,16 @@
-import RepositoryService from 'consul-ui/services/repository';
 import { inject as service } from '@ember/service';
+import RepositoryService from 'consul-ui/services/repository';
 
 const modelName = 'session';
-export default RepositoryService.extend({
-  store: service('store'),
-  getModelName: function() {
+export default class SessionService extends RepositoryService {
+  @service('store')
+  store;
+
+  getModelName() {
     return modelName;
-  },
-  findByNode: function(node, dc, nspace, configuration = {}) {
+  }
+
+  findByNode(node, dc, nspace, configuration = {}) {
     const query = {
       id: node,
       dc: dc,
@@ -18,9 +21,10 @@ export default RepositoryService.extend({
       query.uri = configuration.uri;
     }
     return this.store.query(this.getModelName(), query);
-  },
+  }
+
   // TODO: Why Key? Probably should be findBySlug like the others
-  findByKey: function(slug, dc, nspace) {
+  findByKey(slug, dc, nspace) {
     return this.findBySlug(...arguments);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/repository/token.js b/ui/packages/consul-ui/app/services/repository/token.js
index 15a59b925..75f4017d6 100644
--- a/ui/packages/consul-ui/app/services/repository/token.js
+++ b/ui/packages/consul-ui/app/services/repository/token.js
@@ -8,20 +8,24 @@ const isValidServerError = isValidServerErrorFactory();
 const status = statusFactory(isValidServerError, Promise);
 const MODEL_NAME = 'token';
 
-export default RepositoryService.extend({
-  getModelName: function() {
+export default class TokenService extends RepositoryService {
+  getModelName() {
     return MODEL_NAME;
-  },
-  getPrimaryKey: function() {
+  }
+
+  getPrimaryKey() {
     return PRIMARY_KEY;
-  },
-  getSlugKey: function() {
+  }
+
+  getSlugKey() {
     return SLUG_KEY;
-  },
-  status: function(obj) {
+  }
+
+  status(obj) {
     return status(obj);
-  },
-  self: function(secret, dc) {
+  }
+
+  self(secret, dc) {
     return this.store
       .self(this.getModelName(), {
         secret: secret,
@@ -38,22 +42,25 @@ export default RepositoryService.extend({
         }
         return Promise.reject(e);
       });
-  },
-  clone: function(item) {
+  }
+
+  clone(item) {
     return this.store.clone(this.getModelName(), get(item, PRIMARY_KEY));
-  },
-  findByPolicy: function(id, dc, nspace) {
+  }
+
+  findByPolicy(id, dc, nspace) {
     return this.store.query(this.getModelName(), {
       policy: id,
       dc: dc,
       ns: nspace,
     });
-  },
-  findByRole: function(id, dc, nspace) {
+  }
+
+  findByRole(id, dc, nspace) {
     return this.store.query(this.getModelName(), {
       role: id,
       dc: dc,
       ns: nspace,
     });
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/repository/topology.js b/ui/packages/consul-ui/app/services/repository/topology.js
index 7e9f51383..bd9fb0309 100644
--- a/ui/packages/consul-ui/app/services/repository/topology.js
+++ b/ui/packages/consul-ui/app/services/repository/topology.js
@@ -1,16 +1,19 @@
-import RepositoryService from 'consul-ui/services/repository';
 import { inject as service } from '@ember/service';
+import RepositoryService from 'consul-ui/services/repository';
 import { get, set } from '@ember/object';
 
 const modelName = 'topology';
 const ERROR_MESH_DISABLED = 'Connect must be enabled in order to use this endpoint';
 
-export default RepositoryService.extend({
-  dcs: service('repository/dc'),
-  getModelName: function() {
+export default class TopologyService extends RepositoryService {
+  @service('repository/dc')
+  dcs;
+
+  getModelName() {
     return modelName;
-  },
-  findBySlug: function(slug, kind, dc, nspace, configuration = {}) {
+  }
+
+  findBySlug(slug, kind, dc, nspace, configuration = {}) {
     const datacenter = this.dcs.peekOne(dc);
     if (datacenter !== null && !get(datacenter, 'MeshEnabled')) {
       return Promise.resolve();
@@ -38,5 +41,5 @@ export default RepositoryService.extend({
           throw e;
       }
     });
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/repository/type/component.js b/ui/packages/consul-ui/app/services/repository/type/component.js
deleted file mode 100644
index 5721e49c5..000000000
--- a/ui/packages/consul-ui/app/services/repository/type/component.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import LazyProxyService from 'consul-ui/services/lazy-proxy';
-
-import { fromPromise, proxy } from 'consul-ui/utils/dom/event-source';
-export default LazyProxyService.extend({
-  shouldProxy: function(content, method) {
-    return method.indexOf('find') === 0 || method === 'persist';
-  },
-  execute: function(repo, findOrPersist) {
-    return function() {
-      return proxy(
-        fromPromise(repo[findOrPersist](...arguments)),
-        findOrPersist.indexOf('All') === -1 ? {} : []
-      );
-    };
-  },
-});
diff --git a/ui/packages/consul-ui/app/services/repository/type/event-source.js b/ui/packages/consul-ui/app/services/repository/type/event-source.js
deleted file mode 100644
index 6fffd39ad..000000000
--- a/ui/packages/consul-ui/app/services/repository/type/event-source.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import { inject as service } from '@ember/service';
-import { get } from '@ember/object';
-
-import { restartWhenAvailable } from 'consul-ui/services/client/http';
-import LazyProxyService from 'consul-ui/services/lazy-proxy';
-
-import { cache as createCache, BlockingEventSource } from 'consul-ui/utils/dom/event-source';
-
-const createProxy = function(repo, find, settings, cache, serialize = JSON.stringify) {
-  const client = this.client;
-  // custom createEvent, here used to reconcile the ember-data store for each tick
-  const createEvent = function(result = {}, configuration) {
-    const event = {
-      type: 'message',
-      data: result,
-    };
-    const meta = get(event, 'data.meta') || {};
-    if (typeof meta.range === 'undefined') {
-      repo.reconcile(meta);
-    }
-    return event;
-  };
-  // proxied find*..(id, dc)
-  return function() {
-    const key = `${repo.getModelName()}.${find}.${serialize([...arguments])}`;
-    const _args = arguments;
-    const newPromisedEventSource = cache;
-    return newPromisedEventSource(
-      function(configuration) {
-        // take a copy of the original arguments
-        let args = [..._args];
-        if (configuration.settings.enabled) {
-          // ...and only add our current cursor/configuration if we are blocking
-          args = args.concat([configuration]);
-        }
-        // original find... with configuration now added
-        return repo[find](...args)
-          .then(res => {
-            if (!configuration.settings.enabled || typeof res === 'undefined') {
-              // blocking isn't enabled, or we got no data, immediately close
-              this.close();
-            }
-            return res;
-          })
-          .catch(restartWhenAvailable(client));
-      },
-      {
-        key: key,
-        type: BlockingEventSource,
-        settings: {
-          enabled: typeof settings.blocking === 'undefined' || settings.blocking,
-        },
-        createEvent: createEvent,
-      }
-    );
-  };
-};
-let cache = null;
-let cacheMap = null;
-export default LazyProxyService.extend({
-  settings: service('settings'),
-  client: service('client/http'),
-  init: function() {
-    this._super(...arguments);
-    if (cache === null) {
-      this.resetCache();
-    }
-  },
-  resetCache: function() {
-    Object.entries(cacheMap || {}).forEach(function([key, item]) {
-      item.close();
-    });
-    cacheMap = {};
-    cache = createCache(cacheMap);
-  },
-  willDestroy: function() {
-    Object.entries(cacheMap || {}).forEach(function([key, item]) {
-      item.close();
-    });
-    cacheMap = null;
-    cache = null;
-  },
-  shouldProxy: function(content, method) {
-    return method.indexOf('find') === 0;
-  },
-  execute: function(repo, find) {
-    return this.settings.findBySlug('client').then(settings => {
-      return createProxy.bind(this)(repo, find, settings, cache);
-    });
-  },
-});
diff --git a/ui/packages/consul-ui/app/services/schema.js b/ui/packages/consul-ui/app/services/schema.js
index bf4e9c22f..7874ce824 100644
--- a/ui/packages/consul-ui/app/services/schema.js
+++ b/ui/packages/consul-ui/app/services/schema.js
@@ -3,8 +3,8 @@ import { schema as intentionPermissionSchema } from 'consul-ui/models/intention-
 import { schema as intentionPermissionHttpSchema } from 'consul-ui/models/intention-permission-http';
 import { schema as intentionPermissionHttpHeaderSchema } from 'consul-ui/models/intention-permission-http-header';
 
-export default Service.extend({
-  'intention-permission': intentionPermissionSchema,
-  'intention-permission-http': intentionPermissionHttpSchema,
-  'intention-permission-http-header': intentionPermissionHttpHeaderSchema,
-});
+export default class SchemaService extends Service {
+  'intention-permission' = intentionPermissionSchema;
+  'intention-permission-http' = intentionPermissionHttpSchema;
+  'intention-permission-http-header' = intentionPermissionHttpHeaderSchema;
+}
diff --git a/ui/packages/consul-ui/app/services/settings.js b/ui/packages/consul-ui/app/services/settings.js
index 7870a8ac1..ced7243f2 100644
--- a/ui/packages/consul-ui/app/services/settings.js
+++ b/ui/packages/consul-ui/app/services/settings.js
@@ -8,22 +8,26 @@ export const ifNotBlocking = function(repo) {
     return typeof settings.blocking !== 'undefined' && !settings.blocking;
   });
 };
-export default Service.extend({
-  storage: storage,
-  findAll: function(key) {
+export default class SettingsService extends Service {
+  storage = storage;
+
+  findAll(key) {
     return Promise.resolve(this.storage.all());
-  },
-  findBySlug: function(slug) {
+  }
+
+  findBySlug(slug) {
     return Promise.resolve(this.storage.getValue(slug));
-  },
-  persist: function(obj) {
+  }
+
+  persist(obj) {
     const storage = this.storage;
     Object.keys(obj).forEach((item, i) => {
       storage.setValue(item, obj[item]);
     });
     return Promise.resolve(obj);
-  },
-  delete: function(obj) {
+  }
+
+  delete(obj) {
     // TODO: Loop through and delete the specified keys
     if (!Array.isArray(obj)) {
       obj = [obj];
@@ -34,5 +38,5 @@ export default Service.extend({
       return prev;
     }, {});
     return Promise.resolve(item);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/sort.js b/ui/packages/consul-ui/app/services/sort.js
index 12fa3a597..69d28260e 100644
--- a/ui/packages/consul-ui/app/services/sort.js
+++ b/ui/packages/consul-ui/app/services/sort.js
@@ -1,4 +1,4 @@
 import Service from '@ember/service';
-export default Service.extend({
-  comparator: function(type) {},
-});
+export default class SortService extends Service {
+  comparator(type) {}
+}
diff --git a/ui/packages/consul-ui/app/services/state.js b/ui/packages/consul-ui/app/services/state.js
index efb9cd88e..6e9d612cd 100644
--- a/ui/packages/consul-ui/app/services/state.js
+++ b/ui/packages/consul-ui/app/services/state.js
@@ -3,13 +3,16 @@ import { set } from '@ember/object';
 import flat from 'flat';
 import { createMachine, interpret } from '@xstate/fsm';
 
-export default Service.extend({
-  logger: service('logger'),
+export default class StateService extends Service {
+  @service('logger')
+  logger;
+
   // @xstate/fsm
-  log: function(chart, state) {
+  log(chart, state) {
     // this.logger.execute(`${chart.id} > ${state.value}`);
-  },
-  addGuards: function(chart, options) {
+  }
+
+  addGuards(chart, options) {
     this.guards(chart).forEach(function([path, name]) {
       // xstate/fsm has no guard lookup
       set(chart, path, function() {
@@ -17,11 +20,13 @@ export default Service.extend({
       });
     });
     return [chart, options];
-  },
-  machine: function(chart, options = {}) {
+  }
+
+  machine(chart, options = {}) {
     return createMachine(...this.addGuards(chart, options));
-  },
-  prepareChart: function(chart) {
+  }
+
+  prepareChart(chart) {
     // xstate/fsm has no guard lookup so we clone the chart here
     // for when we replace the string based guards with functions
     // further down
@@ -42,9 +47,10 @@ export default Service.extend({
       });
     }
     return chart;
-  },
+  }
+
   // abstract
-  matches: function(state, matches) {
+  matches(state, matches) {
     if (typeof state === 'undefined') {
       return false;
     }
@@ -52,13 +58,15 @@ export default Service.extend({
     return values.some(item => {
       return state.matches(item);
     });
-  },
-  state: function(cb) {
+  }
+
+  state(cb) {
     return {
       matches: cb,
     };
-  },
-  interpret: function(chart, options) {
+  }
+
+  interpret(chart, options) {
     chart = this.prepareChart(chart);
     const service = interpret(this.machine(chart, options));
     // returns subscription
@@ -69,8 +77,9 @@ export default Service.extend({
       }
     });
     return service;
-  },
-  guards: function(chart) {
+  }
+
+  guards(chart) {
     return Object.entries(flat(chart)).filter(([key]) => key.endsWith('.cond'));
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/store.js b/ui/packages/consul-ui/app/services/store.js
index b4dd9767a..08a0b0274 100644
--- a/ui/packages/consul-ui/app/services/store.js
+++ b/ui/packages/consul-ui/app/services/store.js
@@ -1,25 +1,26 @@
-import Store from 'ember-data/store';
 import { inject as service } from '@ember/service';
+import Store from 'ember-data/store';
 
-export default Store.extend({
-  // TODO: This should eventually go on a static method
-  // of the abstract Repository class
-  http: service('repository/type/event-source'),
-  dataSource: service('data-source/service'),
-  client: service('client/http'),
-  clear: function() {
+export default class StoreService extends Store {
+  @service('data-source/service')
+  dataSource;
+
+  @service('client/http')
+  client;
+
+  clear() {
     // Aborting the client will close all open http type sources
     this.client.abort();
     // once they are closed clear their caches
-    this.http.resetCache();
     this.dataSource.resetCache();
     this.init();
-  },
+  }
+
   //
   // TODO: These only exist for ACLs, should probably make sure they fail
   // nicely if you aren't on ACLs for good DX
   // cloning immediately refreshes the view
-  clone: function(modelName, id) {
+  clone(modelName, id) {
     // TODO: no normalization, type it properly for the moment
     const adapter = this.adapterFor(modelName);
     // passing empty options gives me a snapshot - ?
@@ -32,8 +33,9 @@ export default Store.extend({
       this._internalModelForId(modelName, id).createSnapshot(options)
     );
     // TODO: See https://github.com/emberjs/data/blob/7b8019818526a17ee72747bd3c0041354e58371a/addon/-private/system/promise-proxies.js#L68
-  },
-  self: function(modelName, token) {
+  }
+
+  self(modelName, token) {
     // TODO: no normalization, type it properly for the moment
     const adapter = this.adapterFor(modelName);
     const serializer = this.serializerFor(modelName);
@@ -46,11 +48,12 @@ export default Store.extend({
     return adapter
       .self(this, modelClass, token.secret, token)
       .then(payload => serializer.normalizeResponse(this, modelClass, payload, token, 'self'));
-  },
+  }
+
   //
   // TODO: This one is only for nodes, should fail nicely if you call it
   // for anything other than nodes for good DX
-  queryLeader: function(modelName, query) {
+  queryLeader(modelName, query) {
     const adapter = this.adapterFor(modelName);
     const serializer = this.serializerFor(modelName);
     const modelClass = { modelName: modelName };
@@ -58,10 +61,11 @@ export default Store.extend({
       payload.meta = serializer.normalizeMeta(this, modelClass, payload, null, 'leader');
       return payload;
     });
-  },
+  }
+
   // TODO: This one is only for nspaces and OIDC, should fail nicely if you call it
   // for anything other than nspaces/OIDC for good DX
-  authorize: function(modelName, query = {}) {
+  authorize(modelName, query = {}) {
     const adapter = this.adapterFor(modelName);
     const serializer = this.serializerFor(modelName);
     const modelClass = { modelName: modelName };
@@ -70,10 +74,11 @@ export default Store.extend({
       .then(payload =>
         serializer.normalizeResponse(this, modelClass, payload, undefined, 'authorize')
       );
-  },
-  logout: function(modelName, query = {}) {
+  }
+
+  logout(modelName, query = {}) {
     const adapter = this.adapterFor(modelName);
     const modelClass = { modelName: modelName };
     return adapter.logout(this, modelClass, query.id, query);
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/ticker.js b/ui/packages/consul-ui/app/services/ticker.js
index c2cb59282..81b406779 100644
--- a/ui/packages/consul-ui/app/services/ticker.js
+++ b/ui/packages/consul-ui/app/services/ticker.js
@@ -2,12 +2,13 @@ import Service from '@ember/service';
 import { Tween } from 'consul-ui/utils/ticker';
 
 let map;
-export default Service.extend({
-  init: function() {
-    this._super(...arguments);
+export default class TickerService extends Service {
+  init() {
+    super.init(...arguments);
     this.reset();
-  },
-  tweenTo: function(props, obj = '', frames, method) {
+  }
+
+  tweenTo(props, obj = '', frames, method) {
     // TODO: Right now we only support string id's
     // but potentially look at allowing passing of other objects
     // especially DOM elements
@@ -23,13 +24,15 @@ export default Service.extend({
       map.set(id, Tween.to(obj, props, frames, method));
       return obj;
     }
-  },
+  }
+
   // TODO: We'll try and use obj later for ticker bookkeeping
-  destroy: function(obj) {
+  destroy(obj) {
     this.reset();
     return Tween.destroy();
-  },
-  reset: function() {
+  }
+
+  reset() {
     map = new Map();
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/timeout.js b/ui/packages/consul-ui/app/services/timeout.js
index 2cda8f7c4..baa498756 100644
--- a/ui/packages/consul-ui/app/services/timeout.js
+++ b/ui/packages/consul-ui/app/services/timeout.js
@@ -3,16 +3,17 @@ import promisedTimeoutFactory from 'consul-ui/utils/promisedTimeout';
 import { next } from '@ember/runloop';
 
 const promisedTimeout = promisedTimeoutFactory(Promise);
-export default Service.extend({
+export default class TimeoutService extends Service {
   // TODO: milliseconds should default to 0 or potentially just null
   // if it is 0/null use tick/next instead
   // if Octane eliminates the runloop things, look to use raf here instead
-  execute: function(milliseconds, cb) {
+  execute(milliseconds, cb) {
     return promisedTimeout(milliseconds, cb);
-  },
-  tick: function() {
+  }
+
+  tick() {
     return new Promise(function(resolve, reject) {
       next(resolve);
     });
-  },
-});
+  }
+}
diff --git a/ui/packages/consul-ui/app/services/ui-config.js b/ui/packages/consul-ui/app/services/ui-config.js
index 8a3973008..cdd6b8593 100644
--- a/ui/packages/consul-ui/app/services/ui-config.js
+++ b/ui/packages/consul-ui/app/services/ui-config.js
@@ -1,9 +1,9 @@
 import Service from '@ember/service';
 
-export default Service.extend({
-  config: undefined,
+export default class UiConfigService extends Service {
+  config = undefined;
 
-  get: function() {
+  get() {
     if (this.config === undefined) {
       // Load config from our special meta tag for now. Later it might come from
       // an API instead/as well.
@@ -11,5 +11,5 @@ export default Service.extend({
       this.config = JSON.parse(meta);
     }
     return this.config;
-  },
-});
+  }
+}