Merge pull request #7 from andrewgtv/AndrewsBranch

Connection feature
OMG THIS IS COMMIT