updated date model to conform to #2, actually close #8