Multi driver

Merging multi_driver into master - hopefully won't break everything...