Converted the rest of Vehicles over to the new system.