This is a continuation of the work from #546.

• Bonuses stored as attributes instead of calculated like they are now. This will help with #635
• more as i think of it.