803 heartbreak

803 :heart: 

Refactor Vehicles and VehiclesCollection.

Might be a few chingas, but lets get this chongo loling.