More work on stuff..

Trying to debug the calendar?