Bob's edits to methods
Flesh out photoactivation, still missing CFS.
Bob's edits plus more content for photoactivation.