Add docker's add/drop capabilites

Add docker's add/drop capabilites
Fair points re. compatibility.

I like your proposed structure.