Collapsing everything in mainline to match the demo from blog.