refactored code
more tests and refactoring
comments
uncommitted args from command line