Add add/rm functionality.