More refactoring. Create the BBBuilder rather than WaterFiller. Some
state machine fixes.