modularizing controllers
Added vector sampling