Fully functional, main.js no longer needed