Refactoring: wip generation of waves