Listener mostly working, just need to flesh out specs