towards a fully features calendar
cleanup?