moved everything back into app.js and all is well again