Notification support started. Needs to clear on action
Cleaning up Logs and TODOs