base version of server/client
prototype works
functional server
functional server
'final' version
Merge branch 'net'
'final' version