More changes to the compiler... WIP