Added notifications, working on metrics