Initial
Finish cucumber feature
bug fixes in controller