Initial WIP check-in of 2.x development

This is the networking core of the client, still incomplete.