Rewritten Stage.Add and Stage.Remove so that additions / removals are queued until it is safe to apply them.