Minor updates to support functionality

Not quite sure how to handle this just yet.  The Server will need to update it's reference to the client here.  Every time it accepts a new connection (ie. whenever a client connection is initialized or dropped and reconnects) a new client id is generated.  Unfortunately we don't want that.