It's a wrap, notificaiton work
This closes issue #37