#20 Add a "callback" type handler