side by side
update test
split into theirs and mine
update tests for delegate type events