Added calendar report and refactor work