Code Review (#5.1) + Notifications and Analysis/Snapshot updates