Move more cli scripts into tasks classes. Cli scripts should be as small as possible. Do work in classes for testing.