[delegate] WIP

"make check" passing!