Improving the server as outlined in issue #1