Committing all the specific things Nic did to make stuff work for our latest demo.