Adding steps (and bugs) as I go