Making the commit to refactor udpate callbacks to a single class; this is such a good feeling refactoring. I shouldn't have duped the code int he first place, but at least now I have a stronger concept of what the structure of an update callback should be like.