Finish implementing notifications