better linking + WaveformAnalyzer class