Middle of refactoring
More work, still not finished
Probably done, not tested
Seems to work, not yet fully tested
Calendar cleanup
Merge branch 'master' of github.com:paguini/TestApp into CalRefactoring
TODO