prep work for car array refactoring
cars enter correctly
nasty merge