Updated ClientDriver, added ServerDriver, everything else follows this
change
Merge branch 'connection' into dev