Update README
Move emitter code around
Update TODO
Update dist
Accidentally committed to previously-merged branch