Brand spanking new resolve approach that's faster, more correct, and most of the way to supporting conditionals
Fix bugged tests