JS concat working, just need to add minification, then refactor!