Incremental commit; in the middle of refactoring javascript
Lots of updates