Added a bunch of features to the sample app