Add a simple example app along with small simplification