Yet more work for #35 (think we're getting there)
Closes #38
Also added sound_full_rage