Added a little bit of coverage.
Added a TODO
Added a bit of logging.
Some refactoring. The new resolution result can be built lazily.