Cucumber working again.   Refactor is needed.