Merging vehicle interaction chages and some class restructuring. Needs some more work but the basics are there.