Moving stuff into mondrian.js