Implemented some of the BubbleActivity's TODOs
More TODOs implemented
Finished implementing TODOs