fix confusion between Date and Moment -- why are they making it so confusing?