Combined logic.js to app.js