More code for the driver...

Far from being optimal.