Work in progress...

Added wave details on this. It's starting to take shape