Refactored datetime to be TZ aware
Reverted time sink; need a better way to do this.