Fix
Lots of js-work, nothing quite finished yet