re #748 - Refactor to register callbacks