Rework to integrate client and server comms
removed commented out code
restructue of vehicles made this redundant