- Work on resolver mechanism refactoring. Finished preliminary version, code now compiles, but test fail.