TF 135

Sunstorm with a few additions
Submitted by: 
Steve Randell
1 Jun 2006