Might actually branch this now to make a simple version that works with
the server.