structured the app a little