Feature to handle translation

- We pass all the tests now