My Updates for calendar
Fixing the conflicts
fixing the title and tags
Merged file
Broke a lot of stuff with the rework I started