More work on compiler