2.0

* Remove bonuses as parameter
* Kill random wrapper
* Rearrange solution