Added everything from Fogarty's calendar