JS file refactoring...
Merging in staging...