Title: Making Waves, Revised and Expanded