A redesign, nearly ready. committed for backup purposes