Added all the stuff for the wave demo