Almost done with version 2 of Calendar