Checkpoint.
Change the data structure of the calendar events.
Still under development...