re-rolled most of app with scaffolds