More progress, still compiles