commiting evaluator, but map is incomplete so wont compile, also committing fixed desugarer