Fixing things to make sure add.js works at a later date -- broken at the moment for rebase