[WIP] Resolver work