Update to translation code - not yet complete