Nearly correct.

More simulation debugging - very close now. The only thing
I know is wrong is that the diffusion contributions aren't
prorated.
Added OptionParser from project 1.

Not actually used yet - it needs to be updated extensively.