74efb1c143
Manual refactor into the rough shape we want/how we want the resolve_plan logic to be consolidated. Needs subsequent fixes.