taking it back to the right workflow, also working on some calculations in app.js