cleaned up draft server interface