Updated to use calendar objects and formatting