Driver extraction part2

this will bring back @zeeyang's work from #184
Much love, this needed a comment so we didn't fall down into that trap again. :)