A bunch of progress for second version of the client