diff --git a/frontend/app/components/add-reminder.js b/frontend/app/components/add-reminder.js
index b877417d2..b4e61949e 100644
--- a/frontend/app/components/add-reminder.js
+++ b/frontend/app/components/add-reminder.js
@@ -1,5 +1,6 @@
 import Ember from 'ember';
 import { translationMacro as t } from "ember-i18n";
+import moment from 'moment-timezone';
 
 const {
   get,
@@ -28,7 +29,7 @@ export default Component.extend({
   title: null,
 
   timezones: computed(function() {
-    let originNames = typeof moment !== 'undefined' && moment.tz && moment.tz.names();
+    let originNames = moment.tz.names();
 
     if(originNames) {
       return originNames.map((timezone) => {
diff --git a/frontend/app/components/birth-date.js b/frontend/app/components/birth-date.js
index 0b316df32..56be1d934 100644
--- a/frontend/app/components/birth-date.js
+++ b/frontend/app/components/birth-date.js
@@ -1,5 +1,6 @@
 import Component from '@ember/component';
 import { get, computed } from '@ember/object';
+import moment from 'moment';
 
 export default Component.extend({
   classNames: ['birthDate'],
diff --git a/frontend/app/components/chart-navigation.js b/frontend/app/components/chart-navigation.js
index 3fd62575c..65948f0e1 100644
--- a/frontend/app/components/chart-navigation.js
+++ b/frontend/app/components/chart-navigation.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import moment from 'moment';
 
 const {
   $,
diff --git a/frontend/app/components/chart-patterns.js b/frontend/app/components/chart-patterns.js
index 35e48a59e..4fcfb8722 100644
--- a/frontend/app/components/chart-patterns.js
+++ b/frontend/app/components/chart-patterns.js
@@ -2,6 +2,7 @@ import Ember from 'ember';
 import CheckinByDate from 'flaredown/mixins/checkin-by-date';
 import DatesRetriever from 'flaredown/mixins/chart/dates-retriever';
 import DS from 'ember-data';
+import moment from 'moment';
 
 const {
   get,
diff --git a/frontend/app/components/chart/g-flat.js b/frontend/app/components/chart/g-flat.js
index 8d009f702..2223cb1f4 100644
--- a/frontend/app/components/chart/g-flat.js
+++ b/frontend/app/components/chart/g-flat.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import moment from 'moment';
 import Graphable from 'flaredown/components/chart/graphable';
 
 const {
diff --git a/frontend/app/components/chart/g-hbi.js b/frontend/app/components/chart/g-hbi.js
index bbe5042f7..f79a58e0c 100644
--- a/frontend/app/components/chart/g-hbi.js
+++ b/frontend/app/components/chart/g-hbi.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import moment from 'moment';
 import Colorable from 'flaredown/mixins/colorable';
 import Graphable from 'flaredown/components/chart/graphable';
 
diff --git a/frontend/app/components/chart/g-timeline.js b/frontend/app/components/chart/g-timeline.js
index ee4465591..90e1ddf24 100644
--- a/frontend/app/components/chart/g-timeline.js
+++ b/frontend/app/components/chart/g-timeline.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import moment from 'moment';
 
 export default Ember.Component.extend( {
   tagName: 'g',
diff --git a/frontend/app/components/chart/g-trackable.js b/frontend/app/components/chart/g-trackable.js
index 2d3d9f851..ca8cff3a3 100644
--- a/frontend/app/components/chart/g-trackable.js
+++ b/frontend/app/components/chart/g-trackable.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import moment from 'moment';
 import Graphable from 'flaredown/components/chart/graphable';
 
 const {
diff --git a/frontend/app/components/chart/g-weather.js b/frontend/app/components/chart/g-weather.js
index 4cf69c2c3..2a44f3b2d 100644
--- a/frontend/app/components/chart/g-weather.js
+++ b/frontend/app/components/chart/g-weather.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import moment from 'moment';
 import Colorable from 'flaredown/mixins/colorable';
 import Graphable from 'flaredown/components/chart/graphable';
 
diff --git a/frontend/app/components/checkin/days-nav.js b/frontend/app/components/checkin/days-nav.js
index 605e93d83..ba46d3f08 100644
--- a/frontend/app/components/checkin/days-nav.js
+++ b/frontend/app/components/checkin/days-nav.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import moment from 'moment';
 import CheckinByDate from 'flaredown/mixins/checkin-by-date';
 
 const {
diff --git a/frontend/app/components/checkin/trackables-step.js b/frontend/app/components/checkin/trackables-step.js
index 861dadc13..c1ce37361 100644
--- a/frontend/app/components/checkin/trackables-step.js
+++ b/frontend/app/components/checkin/trackables-step.js
@@ -1,5 +1,6 @@
 import Ember from 'ember';
 import DS from 'ember-data';
+import moment from 'moment';
 import TrackablesFromType from 'flaredown/mixins/trackables-from-type';
 
 const {
diff --git a/frontend/app/components/health-chart.js b/frontend/app/components/health-chart.js
index 7b9f22931..b925bd777 100644
--- a/frontend/app/components/health-chart.js
+++ b/frontend/app/components/health-chart.js
@@ -1,8 +1,12 @@
 import Ember from 'ember';
+import Moment from 'moment';
+import { extendMoment } from 'moment-range';
 import Resizable from './chart/resizable';
 import FieldsByUnits from 'flaredown/mixins/fields-by-units';
 import DatesRetriever from 'flaredown/mixins/chart/dates-retriever';
 
+const moment = extendMoment(Moment);
+
 const {
   get,
   set,
diff --git a/frontend/app/components/journal-entry.js b/frontend/app/components/journal-entry.js
index 58c70b88e..b10baf3b0 100644
--- a/frontend/app/components/journal-entry.js
+++ b/frontend/app/components/journal-entry.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import moment from 'moment';
 
 const {
   get,
diff --git a/frontend/app/components/journal-list.js b/frontend/app/components/journal-list.js
index c4c0ce889..640754dbe 100644
--- a/frontend/app/components/journal-list.js
+++ b/frontend/app/components/journal-list.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import moment from 'moment';
 
 const {
   get,
diff --git a/frontend/app/components/onboarding/completed-step.js b/frontend/app/components/onboarding/completed-step.js
index 3b5f5d394..3c400a533 100644
--- a/frontend/app/components/onboarding/completed-step.js
+++ b/frontend/app/components/onboarding/completed-step.js
@@ -1,5 +1,6 @@
 import Ember from 'ember';
 import CheckinByDate from 'flaredown/mixins/checkin-by-date';
+import moment from 'moment';
 
 export default Ember.Component.extend(CheckinByDate, {
 
diff --git a/frontend/app/components/pattern/chart-group.js b/frontend/app/components/pattern/chart-group.js
index 6596afa2a..5fe4ba979 100644
--- a/frontend/app/components/pattern/chart-group.js
+++ b/frontend/app/components/pattern/chart-group.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import moment from 'moment';
 
 /* global d3 */
 
diff --git a/frontend/app/components/pattern/chart-hover.js b/frontend/app/components/pattern/chart-hover.js
index 65ce10080..7723b2c1d 100644
--- a/frontend/app/components/pattern/chart-hover.js
+++ b/frontend/app/components/pattern/chart-hover.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import moment from 'moment';
 
 /* global d3 */
 
diff --git a/frontend/app/components/pattern/chart-item.js b/frontend/app/components/pattern/chart-item.js
index f5f4dbdf4..adb0bfa4b 100644
--- a/frontend/app/components/pattern/chart-item.js
+++ b/frontend/app/components/pattern/chart-item.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import moment from 'moment';
 
 /* global d3 */
 
diff --git a/frontend/app/components/pattern/index-step.js b/frontend/app/components/pattern/index-step.js
index 1756bbfca..2ffda4cea 100644
--- a/frontend/app/components/pattern/index-step.js
+++ b/frontend/app/components/pattern/index-step.js
@@ -1,5 +1,6 @@
 import Ember from 'ember';
 import DS from 'ember-data';
+import moment from 'moment';
 
 const {
   get,
diff --git a/frontend/app/components/pattern/svg-initial.js b/frontend/app/components/pattern/svg-initial.js
index 6b8dd0ace..3350d149a 100644
--- a/frontend/app/components/pattern/svg-initial.js
+++ b/frontend/app/components/pattern/svg-initial.js
@@ -1,5 +1,6 @@
 import Ember from 'ember';
 import DatesRetriever from 'flaredown/mixins/chart/dates-retriever';
+import moment from 'moment';
 
 const {
   get,
diff --git a/frontend/app/components/signup-form.js b/frontend/app/components/signup-form.js
index b6e792ff3..a8ec18932 100644
--- a/frontend/app/components/signup-form.js
+++ b/frontend/app/components/signup-form.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import moment from 'moment';
 
 const {
   get,
diff --git a/frontend/app/helpers/checkToday.js b/frontend/app/helpers/checkToday.js
index f834b637b..3a0d42c00 100644
--- a/frontend/app/helpers/checkToday.js
+++ b/frontend/app/helpers/checkToday.js
@@ -1,4 +1,5 @@
-import { helper } from "@ember/component/helper";
+import { helper } from '@ember/component/helper';
+import moment from 'moment';
 
 export function checkToday(params) {
   let [date, displayText] = params;
diff --git a/frontend/app/index.html b/frontend/app/index.html
index ae71b1d68..56b52d169 100644
--- a/frontend/app/index.html
+++ b/frontend/app/index.html
@@ -22,7 +22,6 @@
     <script src="{{rootURL}}assets/drag-drop-polyfill/release/drag-drop-polyfill.js"></script>
     <script src="{{rootURL}}assets/vendor.js"></script>
 
-    <script src="{{rootURL}}assets/moment-timezone/builds/moment-timezone-with-data.js"></script>
     <script src="{{rootURL}}assets/flaredown.js"></script>
 
     {{content-for "body-footer"}}
diff --git a/frontend/app/mixins/chart/chart-data-retrieve.js b/frontend/app/mixins/chart/chart-data-retrieve.js
index 4d1914580..92068854b 100644
--- a/frontend/app/mixins/chart/chart-data-retrieve.js
+++ b/frontend/app/mixins/chart/chart-data-retrieve.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import moment from 'moment';
 
 const {
   get,
diff --git a/frontend/app/mixins/chart/dates-retriever.js b/frontend/app/mixins/chart/dates-retriever.js
index 6d31ffac7..122fd0ca5 100644
--- a/frontend/app/mixins/chart/dates-retriever.js
+++ b/frontend/app/mixins/chart/dates-retriever.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import moment from 'moment';
 
 const {
   get,
diff --git a/frontend/app/mixins/checkin-by-date.js b/frontend/app/mixins/checkin-by-date.js
index d381635e4..172008af4 100644
--- a/frontend/app/mixins/checkin-by-date.js
+++ b/frontend/app/mixins/checkin-by-date.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import moment from 'moment';
 
 /*
   Assumes the following exist:
diff --git a/frontend/app/models/checkin.js b/frontend/app/models/checkin.js
index 841fb758f..a4c86120c 100644
--- a/frontend/app/models/checkin.js
+++ b/frontend/app/models/checkin.js
@@ -1,5 +1,6 @@
 import DS from 'ember-data';
 import Ember from 'ember';
+import moment from 'moment';
 
 const {
   attr,
diff --git a/frontend/app/routes/checkin/date.js b/frontend/app/routes/checkin/date.js
index f1fa9c990..bc563d0e0 100644
--- a/frontend/app/routes/checkin/date.js
+++ b/frontend/app/routes/checkin/date.js
@@ -1,6 +1,7 @@
 import Ember from 'ember';
 import AuthenticatedRouteMixin from 'flaredown/mixins/authenticated-route-mixin';
 import CheckinByDate from 'flaredown/mixins/checkin-by-date';
+import moment from 'moment';
 
 const {
   set,
diff --git a/frontend/app/routes/checkin/index.js b/frontend/app/routes/checkin/index.js
index 683bd840a..fe2edb89f 100644
--- a/frontend/app/routes/checkin/index.js
+++ b/frontend/app/routes/checkin/index.js
@@ -1,6 +1,7 @@
 import Ember from 'ember';
 import AuthenticatedRouteMixin from 'flaredown/mixins/authenticated-route-mixin';
 import CheckinByDate from 'flaredown/mixins/checkin-by-date';
+import moment from 'moment';
 
 const {
   get,
diff --git a/frontend/app/routes/index.js b/frontend/app/routes/index.js
index 33da1aa9c..b0484252e 100644
--- a/frontend/app/routes/index.js
+++ b/frontend/app/routes/index.js
@@ -1,6 +1,7 @@
 import Ember from 'ember';
 import AuthenticatedRouteMixin from 'flaredown/mixins/authenticated-route-mixin';
 import CheckinByDate from 'flaredown/mixins/checkin-by-date';
+import moment from 'moment';
 
 const {
   get,
diff --git a/frontend/app/transforms/birthdate.js b/frontend/app/transforms/birthdate.js
index 7fd86074f..9006df956 100644
--- a/frontend/app/transforms/birthdate.js
+++ b/frontend/app/transforms/birthdate.js
@@ -1,5 +1,6 @@
 import DS from 'ember-data';
 import Ember from 'ember';
+import moment from 'moment';
 
 const { get } = Ember;