Cleanup
Trim package.json
Add CLI
Cleanup
More cleanup