Moved notifications stuff to it's own class