pkg2 wip: resolve now basically works.