Moved everything back to index.js