Refactor CLI out of the spec path
Get it all working properly