Added Waves classes and made everything look/run pretty