Remove all the things and add tests.

You don't want to pull this, but take a look and read email