Stage add/removal/reading/building all working