Redesign

@jcredding I'm collecting redesign commits here for this push.  FYI.