Calendar Update

This update adds the calendar function and more base functionality.