Preparing for server model

Getting prepared to add the server stuff. May complete some of the
half-completed functions in the code first.