Starting to put correct headers into demos