Edit needs a few tweaks. Everything else seems to be working.
JS Hero edited code.
Resolved merge conflicts.