--First draft of auto-drive complete.  Committing before testing.