Began implementing connection organization