Refactoring Bubble Breaker part 3

Built, but not yet tested