Modular cmds

Time to merge