More callbacks and refactors.