Final change for vehicles. Vehicle code delayed until 'engine' branch is finished.