more progress with refactoring. Now we get up to the choose 1 or 2 sprayers screen.