wip: Add custom delivery callback.