additional stuff in client and server

client is relatively complete.
serverr needs work but is getting there.