Cleaning up app.js and still looking for that magic work around.