server issues
Merge branch 'bgConnWorking' into server2