Client server dev

It builds, please merge so others may see. The last one didn't seem to go