The new architecture passes all tests, but it still sucks...