Got all tests passing. Somehow.