Add yield code
Add filtered blocks into terse, still need to deal with interpolation