Getting closer, but still pretty far from, a working 1.7 build.