Fixed resolver logic, lots of stuff