added some more cli and split it off into 
separate files