New calendar class as well as table cleaned up the code