Client server dev

Third time is a charm guys...

Merged with dev and tested to ensure that it compiled and ran.