Move it all into the js file