Adding Cucumber, editing a few names