First steps from removing cli.go from this
Fixed a few things, other than that it works fine it seems!
Merge branch 'RemoveCLI.go'