I've got the basic parts of the resolver seemingly working. One concern I have to keep in mind is that I'm not sure how I want the resolution to work in the repl. I'm thinking the simplest solution is to just have some kind of incrementing thing that gets put in the tokens to disambiguate them.
Anyway, I'll work on that later. Trying to think if there's anything else I want to mention... There are some simplifications to my changes that I want to make, but I'm so close to getting through the basic funtionality, and I'd rather push through with it and clean stuff up later.
I'll try out the repl support stuff while this posts.