Go ahead and finish extracting from bf-demo. <!--- @huboard:{"order":2.0,"milestone_order":1.75,"custom_state":""} -->
