Updated... continue the refactoring, setup the ResourceBundle to work ok.