Started some broken js
Fixed merge issue