Continued work on using Calendar to solve Dates