Added useful stuff to Calendar

It should be in a good enough state to for the UI to pull in the info