Working to get ready for demo