refactor out add command
cleanuo