Pre-pitchNJ overhaul

This is a tag to ensure we remember the commit before we start gratuitously deleting template material -- in case we need the template later, we should keep this.