now using thor instead of slop
a bit of refactoring on the thor cli