Revert "Revert "vehicles""

This reverts commit 4e8a62d3a592531e7409803843242e122443db4b.