Working on wave tail
commit before merge
Fixed merge errors yo