diff --git a/bin/em/variabletime/web/js/artboard.js b/bin/em/variabletime/web/js/artboard.js
index 7f58d73..6638c30 100644
--- a/bin/em/variabletime/web/js/artboard.js
+++ b/bin/em/variabletime/web/js/artboard.js
@@ -152,11 +152,7 @@ const Artboard = function(tp, domElement = false, autoInit = true) {
                 });
                 // should we have an audio object, let's inject the buttons, etc
                 if (typeof audio === 'object' && audio.hasOwnProperty('injectPanel')) {
-                    const success = audio.injectPanel(this);
-                    if (success) {
-                        const e = new CustomEvent('injectedAll', {});
-                        tp.getPanel().dispatchEvent(e);
-                    }
+                    audio.injectPanel(this);
                 } else {
                     console.log('Artboard::findInjectPanel', `cannot inject audio panel for ${this.id()} for some reason.`);
                 }
diff --git a/bin/em/variabletime/web/js/audio.js b/bin/em/variabletime/web/js/audio.js
index a4a079e..86cf7c0 100644
--- a/bin/em/variabletime/web/js/audio.js
+++ b/bin/em/variabletime/web/js/audio.js
@@ -807,11 +807,6 @@ const Audio = function(tp, record) {
                 addAudioButton(layer, propTitle, isActive);
             }
         });
-        const good = props.length > 1 && props[0] !== 'dummy'; 
-        if (good) {
-            this.injectedPanelAtLeastOnce = true;
-        }
-        return good;
     };
     const audioSourceCombos = {};
     const readAudioFiles = () => {
diff --git a/bin/em/variabletime/web/js/layer.js b/bin/em/variabletime/web/js/layer.js
index a5c1d6a..9419dd5 100644
--- a/bin/em/variabletime/web/js/layer.js
+++ b/bin/em/variabletime/web/js/layer.js
@@ -802,11 +802,7 @@ const Layer = function(tp, layerID, fontsAndAxes, autoInit = true) {
 
                         // should we have an audio object, let's inject the buttons, etc
                         if (typeof audio === 'object' && typeof audio.injectPanel === 'function') {
-                            const success = audio.injectPanel(this);
-                            if (success) {
-                                const e = new CustomEvent('injectedAll', {});
-                                tp.getPanel().dispatchEvent(e);
-                            }
+                            audio.injectPanel(this);
                         } else {
                             console.log('Layer::findInjectPanel', `cannot inject audio panel for ${this.id()} for some reason.`);
                         }
diff --git a/bin/em/variabletime/web/js/main.js b/bin/em/variabletime/web/js/main.js
index 4c31f84..8268145 100644
--- a/bin/em/variabletime/web/js/main.js
+++ b/bin/em/variabletime/web/js/main.js
@@ -324,31 +324,8 @@ const resize = () => {
     Module.windowResized(Math.round(width * ratio), Math.round(height * ratio));
 };
 
-const setLoadingDoneHook = () => {
-    let addedListener = false;
-    const loadingInjectInterval = setInterval(() => {
-        if (!addedListener) {
-            const panel = tp.getPanel();
-            if (panel !== null) {
-                if (audio.injectedPanelAtLeastOnce) {
-                    window.setLoadingDone();
-                } else {
-                    addedListener = true;
-                    const injectedAll = () => {
-                        window.setLoadingDone();
-                        tp.getPanel().removeEventListener('injectedAll', injectedAll);
-                    };
-                    tp.getPanel().addEventListener('injectedAll', injectedAll);
-                }
-                clearInterval(loadingInjectInterval);
-            }
-        }
-    }, 20);
-};
-
 const postModuleInitialized = () => {
     window.setLoadingTask('setting up animation', 80);
-    setLoadingDoneHook();
     moduleFS.init()
         .then(() => {
             artboard = new Artboard(tp, content);
@@ -357,13 +334,13 @@ const postModuleInitialized = () => {
             tp.connectModuleCallbacks();
             exporter.init();
             getFontsAndAxes();
-            window.setLoadingTask('loading project', 85);
             tp.loadProject().then(() => {
                 interactor.init();
                 resize();
                 adjustPanel();
-                window.setLoadingTask('setting up whatever else is necessary', 100);
+                window.setLoadingTask('setting up animation', 100);
                 window.isInitialized = true;
+                window.setLoadingDone();
                 window.autoSaveInterval = setInterval(() => {
                     if (config.autoSave && window.isInitialized) {
                         tp.saveProject();
diff --git a/bin/em/variabletime/web/js/theatre-play.js b/bin/em/variabletime/web/js/theatre-play.js
index 7fc4e72..082fa86 100644
--- a/bin/em/variabletime/web/js/theatre-play.js
+++ b/bin/em/variabletime/web/js/theatre-play.js
@@ -702,7 +702,6 @@ const TheatrePlay = function(autoInit = false) {
                 const defaultArtboardValues = window.getArtboard().theatreObject.value;
                 const artboardProps = {...defaultArtboardValues, ...artboardValues};
 
-                window.setLoadingTask('setting up artboard', 90);
                 studio.transaction(({
                     set
                 }) => {
@@ -720,7 +719,6 @@ const TheatrePlay = function(autoInit = false) {
                 Object.keys(objects)
                     .filter((e) => e.indexOf('layer-') === 0)
                     .forEach((layerId) => {
-                        window.setLoadingTask(`setting up the shapes of ${layerId} to come`, 90);
                         window.project_fontsHashMap = project.fontsHashMap;
                         layerPromises.push(window.addExistingLayer(layerId, objects[layerId]));
                     });
@@ -731,6 +729,7 @@ const TheatrePlay = function(autoInit = false) {
                         getLayers().forEach((layer) => {
                             if (layer.id() === project.layerOrder[project.layerOrder.length - 1]) {
                                 layer.select();
+                                // add audio mapping?
                             }
                         });
                     }