local app stop/start
move the rock up the hill
more incremental work
updates for sam troubleshooting
incremental stash
more incremental updates