Cleanup of code in progress
Split into test and raremodel 3 modes to generate data More plots Resonances fixed