Finished(ish) the Resolver JSON-based construction code, test now passing