refactored calendar, support for bookmarking now