Resolver

Fixes #5