WIP compiler continued