Shield swapping works more or less as intended.  Special is headed in the right direction; just getting the wave system to behave.