Added basic support for notifications
More stuff for notifications