All tests pass!

Though there are some ugly things that we need to talk about