Added all calendar logic; calendar info now contained in app