More wave management worked out, need a module for managing waves in general