Jl/gar1t/master

Garrett Smith's changes to the driver. I like these, but they need a bit of work before they can be included, hence this PR.