basic testing & small refactoring & notifications
Merge branch 'add-notifications'