Feature/single calendar