First working checkin of @notification functionality