Revert to pre alarm state to fix functionality. creating new branch to refactor alarm code