Passing ShapeUpdaterTest, but have somehow broken other things.
Passing all tests. Now to take out some of those printlns...