add demo calendars
refactor