Refactoring.

I've split out some code that was too cumbersome
together. I believe the radiation simulation portion
and the diffusion portion should be separated.