infield refactor to use preamble
Merge branch 'b-r-refactor'