add controllers -- need to fix the factory as unit test is now failing.
Merge remote-tracking branch 'origin'
merge