shift voting to controller
Test
commmit2
Merge