Adding right-hand switch nonsense and whatever else is in staging.