WIP: Switching to delegating yield