Steps now use dirt. Refactoring.