adding controller class
Merge branch 'gaby2_controller_branch'