Added Wave functionality and fixed blocks.