moved some code from app
moved code coverage to 100