Working on buffs

Trying to get main class working.
Merge remote-tracking branch 'origin/master'