Reworked the buff system.

However, the way we handle buffs needs to be done differently.