Added controller and gender select
v3
Merge branch 'add-a-controller'