Initial version of the new resolver.