update of trucks controller to handle rallies

Gets test #2 to pass
Right now bypassing the rallies_controller until i can refactor