Refactor, client code to connect to server and announce self!