Beginning of the build, a few minor mods to the Define R6