commit before moving into Wave class
moved to wave class but not working
Wave Class now Working!