getting the tests passing at all with only the Nate changes, preparing to hunt