[FOLD] Finish work on the resolver