Flesh out server and client binaries a bit more.