Connection stuff
Merge pull request #18 from andrewgtv/AndrewsConnectionBranch

Connection stuff