Fixes, started work on ClientSideConnection (base started, not
integrated into product)