Rewrote internal connect function to do by demand (aka only open up