WIP: Preping to refactor out custom Date type