Finished the merge
Deleted the vehicles and converted everything to TransportVehicles,
Ready to be used, by the controller