REST-2.0 nearly complete