Refractored, added dependency on go client + connection logic.