working towards more calendar functionality
fixed merge conflicts
nothing