It builds, but the tests are a complete mess.

Also define some types and stuff for #7... Lost in the mix.