Add the add command, some renaming.