Commiting so I can update.
driver.cpp conflict resolution.