added calendar support
fixed merge conflicts and added calendar support