Adds, removes and moves are now correctly handled.