Move things into index.js