Rearrange, and a basic client/server