migrating sample app to new stuff