working on the Wave Implementation

:angel: