More work on the compiler