More Refactor

Finished the current refactor to now pass ball and bumper wrapper
classes, rather than all of the values