part 1 of converting to using MultiItemBlock where appropriate