[Sumit] Adding callbacks. WIP