Adds demo app and many improvements