Adding a bunch of stuff into the sample app