Catch Waves Early, and Catch them Often...