Started to tidy-up the ResearchController. Work in progress.