New extension

Added two more commands and cleaned up the code. Now the add/rem
commands will only work if there is something to add/rem.