Master mostly compiles