More work on base.js
Merge remote-tracking branch 'origin/work'