Removed Calendar. Fixed more compile errors. Will not compile, but getting closer