Got add and remove working.  Still need to do sub-deps.