Waves list partially implemented