Integration complete. Driver re-named. Classes cleaned and commented.