Work in progress on migrating to require.js