add vehicle controller
[#81425322] Fixing conflicts with master
Merge branch 'vicky/81425322_vehicle_controller'