Simple cleanup
Add an interface to set the information that's currently dropped in to blockInfo
Extend interface for C-For loop
Update build to use the new interfaces