functionality complete and working as expected. working on full code coverage