Added waves and scripting ability