Made some progress on the compiler front