Working on wave creation