took out time, implemented waves
added waves