moved more things into app.js and otions object