Working

base server/client
Merge remote-tracking branch 'origin/chauncey'