Bonus Points, Bonus creation and detection

bonus bonus bonus
Resolved conflicts