I just don't understand some of the NBBJ changes

Rolling back to a simpler version.

Perhaps we can add some features one at a time in a way that makes sense.