Added in a Callback class and updated comments.