Stuff

* Refactor mappers so using is smaller
* Redo stream loader to verify not just that stream loads, but that it
loads the correct stuff