Using resolve on all the pertinent routes and refactoring the research states.