added and refactored cucumber feature. need to reword and refactor some of the steps