Fix count + init
Get rid of app.js, moving some code