goingt to revert
Revert "goingt to revert"

This reverts commit 1a4e373343975df9d3cb4c3712a6714490392a38.
working code, need to do TDD/BDD tests