Code

Merge branch 'jc/add-addremove'