Re-added John's server code