Augmented Gerstner Waves - WIP #1