Made a lot of little changes, and took advantage of inheritance.

Buffs should be ready to be implemented now.