WIP getting the tests running and passing.