Initial commit
Nearly working with new CLI
New bug discovered
Fix formatting