Consolidating my branches that are ready to merge after this update. This one is VehicleClipVehicle.