Another day in JS

Change some - lots of TODOs