diff --git a/packages/core/src/app.ts b/packages/core/src/app.ts
index b295da341..193e15e34 100644
--- a/packages/core/src/app.ts
+++ b/packages/core/src/app.ts
@@ -44,7 +44,7 @@ export class App {
   ) {
     this.setBackgroundColor(Color.BLACK)
     this.config = defineConfig({
-      unit: 'frame',
+      unit: 's',
     })
     if (element === void 0) {
       console.warn(
@@ -73,8 +73,8 @@ export class App {
    */
   checkout(scene: Scene): this {
     for (const plugin of this.plugins) plugin.beforeCheckout(this, scene)
-
     this.scene = scene
+    this.scene.startTime = performance.now()
     this.last = this.scene.root
     for (const plugin of this.plugins) plugin.onCheckout(this, this.scene)
     // if (!scene.root.hasSet)
@@ -117,7 +117,12 @@ export class App {
     for (const plugin of app.plugins) plugin.onUpdate(app, app.scene.elapsed)
 
     if (app.playing) {
-      app.scene.elapsed += 1
+      if (app.config.unit === 'frame')
+        app.scene.elapsed += 1
+      else if (app.config.unit === 'ms')
+        app.scene.elapsed = performance.now() - app.scene.startTime
+      else if (app.config.unit === 's')
+        app.scene.elapsed = (performance.now() - app.scene.startTime) / 1000
       app.surface.requestAnimationFrame((canvas: Canvas) => {
         App.update(app, canvas)
       })
diff --git a/packages/core/src/scene.ts b/packages/core/src/scene.ts
index 1eacbc3ef..3fdd3b0ed 100644
--- a/packages/core/src/scene.ts
+++ b/packages/core/src/scene.ts
@@ -2,6 +2,7 @@ import type { Widget } from './widget'
 
 export class Scene {
   elapsed = 0
+  startTime: number
 
   constructor(public root: Widget) {}
 }
diff --git a/packages/core/src/widget.ts b/packages/core/src/widget.ts
index c26eb83a9..e5ab1de1b 100644
--- a/packages/core/src/widget.ts
+++ b/packages/core/src/widget.ts
@@ -184,6 +184,7 @@ export class Widget {
           }
           break
         }
+        // TODO: Align and Baseline
       }
       index += 1
     }