Massive design overhaul; no functional changes.