Cucumber features removed. Spec refactored. Still WIP