Decided to roll this all back (or rather forward) and start from scratch

This got way out of hand, I want to first get a new vehicle system
working before I start moving existing vehicles over. (This is a nasty
way of doing it but better than nothing)