Feat/data model

added calendar