Version 2 of calendar finished