It compiles now, and only 2 of 14 tests fail