Sorted out JS and bundling