updates to allow for Date storage.
Updated unit test.