Finish API!
Merge branch 'auth-notifications'