WIP on refactoring adaptor/driver base classes