refactoring , most under command line opts, unfinish