Added basic yield support. More complex handling to come.