Modified controller to remove most use of the Calendar object