working towards self updating calendar view
fixed merge conflicts