Quick, commit stuff!
Merge remote-tracking branch 'origin/js-refac'
Done with JS refac for now