Merge pull request #245 from SuperCowPowers/cli-work

Cli work
snapshot; yes I know very sloppy
removing unused code