Get it kind of working
Clean up client/server protocol a bit