More 1.7, almost done with the compile errors