Fixed server and client up.

Not fully tested but compiles now.