diff --git a/app/pages/PageEnigma/js/editor.js b/app/pages/PageEnigma/js/editor.js
index 2f6fd574a7..e48b984244 100644
--- a/app/pages/PageEnigma/js/editor.js
+++ b/app/pages/PageEnigma/js/editor.js
@@ -19,6 +19,8 @@ import { UnrealBloomPass } from 'three/addons/postprocessing/UnrealBloomPass.js'
 import { BokehPass } from 'three/addons/postprocessing/BokehPass.js';
 import { createFFmpeg, fetchFile } from '@ffmpeg/ffmpeg';
 
+import {API2, Clip2} from './timeline.tsx';
+
 if (typeof window !== 'undefined') {
     import('ccapture.js').then(module => {
         const CCapture = module.CCapture;
@@ -127,11 +129,6 @@ class Editor {
 
         // Controls and movement.
         this.orbit = new OrbitControls(this.camera, this.renderer.domElement);
-        //this.orbit.movementSpeed = 1;
-        //this.orbit.rollSpeed = Math.PI / 24;
-        //this.orbit.autoForward = false;
-        //this.orbit.dragToLook = true;
-        //this.orbit.damping = 0.2;
 
         this.control = new TransformControls(this.camera, this.renderer.domElement);
 
@@ -146,7 +143,7 @@ class Editor {
 
         // Base control and debug stuff remove debug in prod.
         this._initialize_control();
-        //this._debug_stats(); // REMOVE IN PRODUCTION
+        this._debug_stats(); // REMOVE IN PRODUCTION
 
         // UI & UX stuff.
         // this._setup_buttons();
@@ -162,6 +159,8 @@ class Editor {
         this.audio_manager = new AudioManager();
         this.audio_manager.addCamera(this.camera);
 
+        this.timeline = new API2();
+
         //this.create_geometry("Box");
     }
 
@@ -253,34 +252,6 @@ class Editor {
         }
     }
 
-    // Sets up the UI buttons
-    _setup_buttons() {
-        document.getElementById("playButton").addEventListener("click", this.togglePlay.bind(this));
-        document.getElementById("fps-60").addEventListener("click", () => this.set_fps(60));
-        document.getElementById("fps-30").addEventListener("click", () => this.set_fps(30));
-        document.getElementById("fps-24").addEventListener("click", () => this.set_fps(24));
-
-        // Creation buttons.
-        let boundCreateGeometry = this.create_geometry.bind(this);
-        document.getElementById("C-Box").addEventListener("click", () => boundCreateGeometry("Box"));
-        document.getElementById("C-Cone").addEventListener("click", () => boundCreateGeometry("Cone"));
-        document.getElementById("C-Cylinder").addEventListener("click", () => boundCreateGeometry("Cylinder"));
-        document.getElementById("C-Sphere").addEventListener("click", () => boundCreateGeometry("Sphere"));
-        document.getElementById("C-Donut").addEventListener("click", () => boundCreateGeometry("Donut"));
-
-        let boundTranlationMode = this.change_mode.bind(this);
-        document.getElementById("mov-transform").addEventListener("click", () => boundTranlationMode("translate"));
-        document.getElementById("mov-scale").addEventListener("click", () => boundTranlationMode("scale"));
-        document.getElementById("mov-rotate").addEventListener("click", () => boundTranlationMode("rotate"));
-
-        document.getElementById("btn-save").addEventListener("click", this.save.bind(this));
-        document.getElementById("btn-load").addEventListener("click", () => document.getElementById("load-upload").click());
-        document.getElementById('load-upload').addEventListener('change', this.load.bind(this));
-
-        // Rendering buttons
-        document.getElementById("render-btn").addEventListener("click", this.togglePlayback.bind(this));
-    }
-
     render_mode() {
         this.rendering = !this.rendering;
         console.log(this.rendering);
diff --git a/app/pages/PageEnigma/js/timeline.js b/app/pages/PageEnigma/js/timeline.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/app/pages/PageEnigma/js/timeline.tsx b/app/pages/PageEnigma/js/timeline.tsx
new file mode 100644
index 0000000000..0d42d84a96
--- /dev/null
+++ b/app/pages/PageEnigma/js/timeline.tsx
@@ -0,0 +1,80 @@
+// Write unsubcribe and run the remainder of the clip tech.
+
+
+export class Clip2 {
+    name: string
+    startOffset: number
+    timerID: NodeJS.Timeout | null
+    lengthOfClip: number
+    scrubberEndingPosition: number
+
+    constructor(name: string, startOffset: number, lengthOfClip: number) {
+        this.startOffset = startOffset
+        this.lengthOfClip = lengthOfClip
+        this.name = name
+        this.timerID = null
+
+        this.scrubberEndingPosition = 100
+    }
+
+    async play(): Promise<void> {
+        console.log(`Playing ${this.name}`)
+        this.timerID = setInterval(async () => {
+            console.log(`Running async ${this.name}`)
+            this.stop()
+        }, this.lengthOfClip)
+    }
+
+    async stop(): Promise<void> {
+        clearInterval(this.timerID!)
+        console.log(`Stopping ${this.name}`)
+    }
+}
+
+export class API2 {
+    timelineItems: Clip[]
+    timerID: NodeJS.Timeout | null
+    timeLineLimit: number
+    
+    runningClips: Clip[]
+
+    constructor() {
+        this.timelineItems = []
+        this.timerID = null
+        this.timeLineLimit = 1000 * 10
+        this.runningClips = []
+    }
+
+    async addPlayableClip(clip: Clip): Promise<void> {
+        this.timelineItems.push(clip)
+    }
+
+    async start(): Promise<void> {
+        let start = 0
+        const updateInterval = 100
+        const timerID = setInterval(async () => {
+            console.log(`Current Time:${start}`)
+            
+            // get last updated time when stopped
+            for (const element of this.timelineItems) {
+                if (element.startOffset >= start) {
+                    element.play()
+                    // remove the element
+                    this.timelineItems = this.timelineItems.filter(item => item !== element)
+                }
+            }
+            if (start == this.timeLineLimit || this.timelineItems.length == 0) {
+                this.stop()
+            }
+            
+            start += updateInterval
+        }, updateInterval)
+        
+        this.timerID = timerID
+    }
+
+    async stop(): Promise<void> {
+        console.log(`Stopping Timeline`)
+        clearInterval(this.timerID!)
+    }
+}