Added Basic Support for Multiple Waves