Resolve step almost complete, variable resolves written but untested, method resolving to come. Lots of TODOs. Cyclic inheritance only semi-solved.