Adds activity print out and refactors resolver