Compiles and more tests succeed now.
TODO: Metadata move to hppc? or stay jcf?