moving things around in preparation for committing the server stuff