Working on notifications, refactored startups.
Merge remote-tracking branch 'origin/master'