Bonus package refactor
Bonus implementation
Character implement