Starting to get waves working