Need to bring the Calendar representation into the main class