Add all pieces back to app.js