Main calendar code cleaned up. Smart scheduling methods starting to be in place, but not ready for review. Still need to double check functionality of method that figures out if time slot is taken.