Restructure the emitter
Change the p tag
Add a couple of tests