Completed rewrite of resolver. Everything should be good now