Added unfinished methods for BubbleFactory and BubbleThread
Fixed merge conflicts