Added logic to initator and listener client.

I did this without testing so that we could try and test it together.
Merge branch 'master' of github.com:cyphactor/matchmaker