r7171: Just learning my way around the new SWAT, and updating some