resurrecting the resolver (but with support for almond as well this time)