We'll probably end up using the vehicle class
Slow but steady progress, nowhere near done though