Move stuff around, make the basic test pass