Moved wavepath to class
Wavepath ftw