WIP sample app with new stuff