[CLEAN] Refactor to add an "all" command