Work in progress on wave simulation