Added CLI
cleaned up debug
Removed old main method
Merge pull request #1 from creising/dev

Dev