Flesh out server implementation