Started initial work on the calendar for reminders
Fixed Conflicts and merged