Getting closer to moving Bubble common logic.
Still some reorg and documentation to do before moving forward with PopTart.