Now using Dates (class) for handling dates, but doesn't work yet