Adding some new code and an example 'test' controller to demonstrate it's use.