getting ready to refactor Callback's into CallbackContainer
Refactored to include CallbackContainer object.