Adding all of this for the demo so in case things die it's okay
Adding more stuff