More work on sample app