Resolver changes

I did more resolver stuff yeaaaahhhhh.