Lots more

Massive update, still not done. More and more client/server code.