[WIP] Work on Resolver - doesn't compile