Intermediate commit, adding driver contexts (#21)