Driver is no longer global

We're passing it along through various function calls.