Updated JS to newest status
Continuing integration of upstream updates
Further updates and upgrades
Progressed to variables
Finished merging in 776583f