Patch 1

Added times for the calendar.
This is a first version.
Needs some more work but ill get to them next week.
Thought to send this in as  i know you are working on similar stuff. Perhaps we can avoid double work.