Trying not to turn an improvement into a mess. Paused on the mess stage.