Added waves. Not yet fully implemented.
merge fix.