Move fWave solver functions to class