General Updates

Rewrote some analysis so they're completely written in R. Rearchitected
the way that analyses are stuctured, so they can be defined all in the
one place.