Add the demo server back, slightly cleaned up.