Flesh out trunk.js some more