Done internationalization and add happy path