Working on the unified resolver...