Major overhaul of server