Redesign

Attempting to clean Percival up.