Done with listeners for now.
Fixing client.
Merge branch 'master' of github.com:dchbx/hbx_enterprise