Work in progress, calendar implimentation and tests