Final bits to get driver working