Slight rework of Translate, but still wrong.
Added failing tests for Translate
Other slight refactoring of Name lookups