More WIP refactor of connection and driver interfaces