Updated to include alarm cusomizations and departments.  Also optimized calendar code