A few items refactored and BB setup.