Refactor code to allow for an optional second client connecection

Summary: Allow for a second client.

Test Plan: npm test

Reviewers: fadrizul

Subscribers: fadrizul

Differential Revision: http://diff.myteksi.net/D25