Driver extraction part2

this will bring back @zeeyang's work from #184