diff --git a/package-lock.json b/package-lock.json
index 4d9c938e..e44e6c3c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1142,6 +1142,17 @@
         "glob-to-regexp": "^0.3.0"
       }
     },
+    "@nateradebaugh/react-datetime": {
+      "version": "4.4.11",
+      "resolved": "https://registry.npmjs.org/@nateradebaugh/react-datetime/-/react-datetime-4.4.11.tgz",
+      "integrity": "sha512-PO/j7v8cb0Aw/MwokOL07jyYAnwkvLp9Y9n+cR4Rqr4bM051uj9VHufuXQduMj1BKAfIMNIIrhb4NhcGCnjwow==",
+      "requires": {
+        "@reach/popover": "0.16.2",
+        "classcat": "^5.0.1",
+        "date-fns": "^2.28.0",
+        "use-onclickoutside": "^0.4.0"
+      }
+    },
     "@nodelib/fs.stat": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
@@ -1152,6 +1163,82 @@
       "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.5.4.tgz",
       "integrity": "sha512-ZpKr+WTb8zsajqgDkvCEWgp6d5eJT6Q63Ng2neTbzBO76Lbe91vX/iVIW9dikq+Fs3yEo+ls4cxeXABD2LtcbQ=="
     },
+    "@reach/observe-rect": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@reach/observe-rect/-/observe-rect-1.2.0.tgz",
+      "integrity": "sha512-Ba7HmkFgfQxZqqaeIWWkNK0rEhpxVQHIoVyW1YDSkGsGIXzcaW4deC8B0pZrNSSyLTdIk7y+5olKt5+g0GmFIQ=="
+    },
+    "@reach/popover": {
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@reach/popover/-/popover-0.16.2.tgz",
+      "integrity": "sha512-IwkRrHM7Vt33BEkSXneovymJv7oIToOfTDwRKpuYEB/BWYMAuNfbsRL7KVe6MjkgchDeQzAk24cYY1ztQj5HQQ==",
+      "requires": {
+        "@reach/portal": "0.16.2",
+        "@reach/rect": "0.16.0",
+        "@reach/utils": "0.16.0",
+        "tabbable": "^4.0.0",
+        "tslib": "^2.3.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
+        }
+      }
+    },
+    "@reach/portal": {
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@reach/portal/-/portal-0.16.2.tgz",
+      "integrity": "sha512-9ur/yxNkuVYTIjAcfi46LdKUvH0uYZPfEp4usWcpt6PIp+WDF57F/5deMe/uGi/B/nfDweQu8VVwuMVrCb97JQ==",
+      "requires": {
+        "@reach/utils": "0.16.0",
+        "tiny-warning": "^1.0.3",
+        "tslib": "^2.3.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
+        }
+      }
+    },
+    "@reach/rect": {
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/@reach/rect/-/rect-0.16.0.tgz",
+      "integrity": "sha512-/qO9jQDzpOCdrSxVPR6l674mRHNTqfEjkaxZHluwJ/2qGUtYsA0GSZiF/+wX/yOWeBif1ycxJDa6HusAMJZC5Q==",
+      "requires": {
+        "@reach/observe-rect": "1.2.0",
+        "@reach/utils": "0.16.0",
+        "prop-types": "^15.7.2",
+        "tiny-warning": "^1.0.3",
+        "tslib": "^2.3.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
+        }
+      }
+    },
+    "@reach/utils": {
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/@reach/utils/-/utils-0.16.0.tgz",
+      "integrity": "sha512-PCggBet3qaQmwFNcmQ/GqHSefadAFyNCUekq9RrWoaU9hh/S4iaFgf2MBMdM47eQj5i/Bk0Mm07cP/XPFlkN+Q==",
+      "requires": {
+        "tiny-warning": "^1.0.3",
+        "tslib": "^2.3.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
+        }
+      }
+    },
     "@sentry/hub": {
       "version": "5.28.0",
       "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.28.0.tgz",
@@ -1822,6 +1909,11 @@
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
       "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
     },
+    "are-passive-events-supported": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/are-passive-events-supported/-/are-passive-events-supported-1.1.1.tgz",
+      "integrity": "sha512-5wnvlvB/dTbfrCvJ027Y4L4gW/6Mwoy1uFSavney0YO++GU+0e/flnjiBBwH+1kh7xNCgCOGvmJC3s32joYbww=="
+    },
     "are-we-there-yet": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
@@ -3455,6 +3547,11 @@
         }
       }
     },
+    "classcat": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/classcat/-/classcat-5.0.3.tgz",
+      "integrity": "sha512-6dK2ke4VEJZOFx2ZfdDAl5OhEL8lvkl6EHF92IfRePfHxQTqir5NlcNVUv+2idjDqCX2NDc8m8YSAI5NI975ZQ=="
+    },
     "classnames": {
       "version": "2.2.6",
       "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
@@ -4348,6 +4445,11 @@
         "whatwg-url": "^8.0.0"
       }
     },
+    "date-fns": {
+      "version": "2.28.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.28.0.tgz",
+      "integrity": "sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw=="
+    },
     "debug": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -9829,6 +9931,14 @@
       "resolved": "https://registry.npmjs.org/moment-duration-format/-/moment-duration-format-2.3.2.tgz",
       "integrity": "sha512-cBMXjSW+fjOb4tyaVHuaVE/A5TqkukDWiOfxxAjY+PEqmmBQlLwn+8OzwPiG3brouXKY5Un4pBjAeB6UToXHaQ=="
     },
+    "moment-timezone": {
+      "version": "0.5.34",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.34.tgz",
+      "integrity": "sha512-3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg==",
+      "requires": {
+        "moment": ">= 2.9.0"
+      }
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
@@ -17425,6 +17535,11 @@
       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
     },
+    "tabbable": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-4.0.0.tgz",
+      "integrity": "sha512-H1XoH1URcBOa/rZZWxLxHCtOdVUEev+9vo5YdYhC9tCY4wnybX+VQrCYuy9ubkg69fCBxCONJOSLGfw0DWMffQ=="
+    },
     "table": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/table/-/table-4.0.3.tgz",
@@ -18074,6 +18189,28 @@
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
     },
+    "use-isomorphic-layout-effect": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.1.tgz",
+      "integrity": "sha512-L7Evj8FGcwo/wpbv/qvSfrkHFtOpCzvM5yl2KVyDJoylVuSvzphiiasmjgQPttIGBAy2WKiBNR98q8w7PiNgKQ=="
+    },
+    "use-latest": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/use-latest/-/use-latest-1.2.0.tgz",
+      "integrity": "sha512-d2TEuG6nSLKQLAfW3By8mKr8HurOlTkul0sOpxbClIv4SQ4iOd7BYr7VIzdbktUCnv7dua/60xzd8igMU6jmyw==",
+      "requires": {
+        "use-isomorphic-layout-effect": "^1.0.0"
+      }
+    },
+    "use-onclickoutside": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/use-onclickoutside/-/use-onclickoutside-0.4.0.tgz",
+      "integrity": "sha512-lg1U+V8SaCfemgBs5dg+cfEOzjuwVS9ATH0VMLSBHI6R11tbfmiKci1lg6pjwXr1sj95XWd2+5EbffJEAPdkJQ==",
+      "requires": {
+        "are-passive-events-supported": "^1.1.0",
+        "use-latest": "^1.0.0"
+      }
+    },
     "util": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
diff --git a/package.json b/package.json
index f16ebaeb..726e30b9 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
     "@fortawesome/fontawesome-svg-core": "^1.2.14",
     "@fortawesome/free-solid-svg-icons": "^5.7.1",
     "@fortawesome/react-fontawesome": "^0.1.4",
+    "@nateradebaugh/react-datetime": "^4.4.11",
     "@popperjs/core": "^2.5.4",
     "@svgr/webpack": "2.4.1",
     "axios": "^0.19.0",
@@ -53,6 +54,7 @@
     "mini-css-extract-plugin": "0.4.3",
     "moment": "^2.24.0",
     "moment-duration-format": "^2.2.2",
+    "moment-timezone": "^0.5.34",
     "node-sass": "^4.14.0",
     "optimize-css-assets-webpack-plugin": "5.0.1",
     "pnp-webpack-plugin": "1.1.0",
diff --git a/src/components/PhaseInput/PhaseInput.module.scss b/src/components/PhaseInput/PhaseInput.module.scss
index 8ec34a00..e16fc96b 100644
--- a/src/components/PhaseInput/PhaseInput.module.scss
+++ b/src/components/PhaseInput/PhaseInput.module.scss
@@ -1,5 +1,10 @@
 @import "../../styles/includes";
-@i
+
+:global {
+  div[data-reach-popover] {
+    z-index: 10;
+  }
+}
 
 .container {
   display: flex;
diff --git a/src/components/PhaseInput/index.js b/src/components/PhaseInput/index.js
index 2a87c6a6..c70afdbb 100644
--- a/src/components/PhaseInput/index.js
+++ b/src/components/PhaseInput/index.js
@@ -1,28 +1,38 @@
 import _ from 'lodash'
-import moment from 'moment'
+import moment from 'moment-timezone'
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import styles from './PhaseInput.module.scss'
 import cn from 'classnames'
-import DayPickerInput from 'react-day-picker/DayPickerInput'
-import TimePicker from 'rc-time-picker'
-import {
-  formatDate,
-  parseDate
-} from 'react-day-picker/moment'
 import 'react-day-picker/lib/style.css'
 import 'rc-time-picker/assets/index.css'
 import Select from '../Select'
+import DateTime from '@nateradebaugh/react-datetime'
+import isAfter from 'date-fns/isAfter'
+import subDays from 'date-fns/subDays'
+import '@nateradebaugh/react-datetime/scss/styles.scss'
 
-const timeFormat = 'HH:mm'
-const dateFormat = 'MM/DD/YYYY'
+const dateFormat = 'MM/DD/YYYY HH:mm'
+// const tcTimeZone = 'America/New_York'
 
 class PhaseInput extends Component {
+  constructor (props) {
+    super(props)
+
+    this.onDateChange = this.onDateChange.bind(this)
+  }
+
+  onDateChange (e) {
+    const { onUpdatePhase } = this.props
+
+    onUpdatePhase(moment(e, dateFormat))
+  }
+
   render () {
     const { phase, onUpdateSelect, onUpdatePhase, withDates, withDuration, endDate, readOnly } = this.props
     if (_.isEmpty(phase)) return null
+
     const date = moment(phase.date).format(dateFormat)
-    const time = moment(phase.date)
 
     return (
       <div className={styles.container}>
@@ -33,13 +43,32 @@ class PhaseInput extends Component {
               withDuration && endDate && (
                 <div className={styles.previewDates}>
                   <span>Ends:</span>
-                  {moment(endDate).format(`${dateFormat} ${timeFormat}`)}
+                  {moment(endDate).local().format(`${dateFormat}`)}
                 </div>
               )
             }
           </div>
           <div className={cn(styles.field, styles.col2)}>
             {
+              withDates && (
+                <div className={styles.dayPicker}>
+                  {
+                    readOnly ? (
+                      <span className={styles.readOnlyValue}>{date}</span>
+                    )
+                      : (
+                        <DateTime
+                          value={date}
+                          onChange={this.onDateChange}
+                          isValidDate={(current) => {
+                            const yesterday = subDays(new Date(), 1)
+                            return isAfter(current, yesterday)
+                          }}
+                        />)}
+                </div>
+              )
+            }
+            {/* {
               withDates && (
                 <div className={styles.dayPicker}>
                   {readOnly ? (
@@ -62,7 +91,7 @@ class PhaseInput extends Component {
                   />)}
                 </div>
               )
-            }
+            } */}
             {
               withDuration && (
                 <div className={styles.durationPicker}>