Problem fireball code backed out

Will work and recommit changes to make this work.
Fireball fix

This should be right. And yet it is not.