Working on notifications and subscriptions #202