Words are now resolved in routing using promises. Plus refactoring of main controller in an attempt to fix problems when moving between states