Move connection in preperation for golib changes