filling out Wave class more