Gut the complicated cli and stuff it into seperate tools