Incorporated the encoding library fully into the handshake between client/server. Updated the TODO's