Merging. Pushing sort of jenky/working update.js
Merged