Working Calendar backend
need to cleanup design