Everything but treatments is working correctly.

So.... Long story short stuff was messed up and it wouldn't compile. It
now compiles and stuff that isn't supposed to be committed isn't
committed. Also almost everything works correctly except the treatments.
But that's for tomorrow morning.