add/remove stuff; rebuild