Flesh out some of the callbacks