Finished work on main calendar