Adding the final touches to the example app.  Tests inc.