Multi file addition/removal WIP