Compiling; tests passing again