A bunch of changes towards getting a sample app skeleton. Still more to do.