Making a slight architecture change and adding class to manage notifications