- Added resonance stuff (partially working)