Add in notifications and error handling