Moderate sized overhaul of most components.