Proper Commit for the Notification Bug Fix Merge This!
Refactoring and fixing bugs