Basic connection logic in place
Merging
More merge fixes