Initial work on reinstating the add and rm commands.