Cleared old stuff out thats not needed in new version
Changed demo to new version and made it simpler