Added calendar and assignments