WIP: Further conversion from Handle to Connection

Some compile errors at this point.