Moved mark/unmark logic into calendar and fixed major issue with unmarking