Adds tags and begin calendar refactoring