Redo

Rushed some of this to the class, redo all the buffs and take off the
bar life of the spy.