one server queue refactor