UI server needs a bit more work