create new controller
Merge branch 'working-1'