Compiles against new stuff, but otherwise largely untested