Updates to view calendar/testing

probably not fully functional