Assignment 5 - Added database, service and notifications