Starting to improve translation - WIP