Add vestals, move stuff around.