diff --git a/src/_oldvideo/components/internal/ThumbnailGeneratorInternal.tsx b/src/_oldvideo/components/internal/ThumbnailGeneratorInternal.tsx
index 2ed36d69..702b687c 100644
--- a/src/_oldvideo/components/internal/ThumbnailGeneratorInternal.tsx
+++ b/src/_oldvideo/components/internal/ThumbnailGeneratorInternal.tsx
@@ -54,6 +54,7 @@ export default function ThumbnailGeneratorInternal() {
   const descriptor = useVideoPlayerDescriptor();
   const source = useSource(descriptor);
 
+  // TODO fix memory leak
   const videoRef = useRef<HTMLVideoElement>(document.createElement("video"));
   const canvasRef = useRef<HTMLCanvasElement>(document.createElement("canvas"));
   const hlsRef = useRef<Hls>(new Hls());
diff --git a/src/components/player/Player.ts b/src/components/player/Player.ts
deleted file mode 100644
index 0931ffa1..00000000
--- a/src/components/player/Player.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./atoms";
-export * from "./base/Container";
diff --git a/src/components/player/Player.tsx b/src/components/player/Player.tsx
index 4cd0f48e..0931ffa1 100644
--- a/src/components/player/Player.tsx
+++ b/src/components/player/Player.tsx
@@ -1,3 +1,2 @@
-import { ReactNode } from "react";
-export * as Atoms from "./atoms/index";
-export 
\ No newline at end of file
+export * from "./atoms";
+export * from "./base/Container";
diff --git a/src/components/player/README.md b/src/components/player/README.md
new file mode 100644
index 00000000..d85289fd
--- /dev/null
+++ b/src/components/player/README.md
@@ -0,0 +1,16 @@
+# Video player component
+
+Video player is quite a complex component, so here is a rundown of all the parts
+
+# Composable parts
+These parts can be used to build any shape of a video player.
+ - `/atoms`- any ui element that controls the player. (Seekbar, Pause button, quality selection, etc)
+ - `/base` - base components that are used to build a player. Like the main container
+
+# internal parts
+These parts are internally used, they aren't exported. Do not use them outside of player internals.
+- `/display` - display interface, abstraction on how to actually play the content (e.g Video element, HLS player, Standard video element, etc)
+- `/internals` - Internal components that are always rendered on every player.
+- `/utils` - miscellaneous logic
+- `/hooks` - hooks only used for video player
+- `~/src/stores/player` - state for the video player. Should only be used by internal parts
diff --git a/src/components/player/display/displayInterface.ts b/src/components/player/display/displayInterface.ts
new file mode 100644
index 00000000..99ddc52c
--- /dev/null
+++ b/src/components/player/display/displayInterface.ts
@@ -0,0 +1,22 @@
+import { Source } from "@/components/player/hooks/usePlayer";
+
+type EventMap = Record<string, any>;
+type EventKey<T extends EventMap> = string & keyof T;
+type EventReceiver<T> = (params: T) => void;
+
+export interface Emitter<T extends EventMap> {
+  on<K extends EventKey<T>>(eventName: K, fn: EventReceiver<T[K]>): void;
+  off<K extends EventKey<T>>(eventName: K, fn: EventReceiver<T[K]>): void;
+  emit<K extends EventKey<T>>(eventName: K, params: T[K]): void;
+}
+
+interface Listener<T extends EventMap> {
+  on<K extends EventKey<T>>(eventName: K, fn: EventReceiver<T[K]>): void;
+}
+
+export interface DisplayInterface<Events extends EventMap>
+  extends Listener<Events> {
+  play(): void;
+  pause(): void;
+  load(source: Source): void;
+}
diff --git a/src/components/player/internals/VideoContainer.tsx b/src/components/player/internals/VideoContainer.tsx
index 1cd28f51..39076e67 100644
--- a/src/components/player/internals/VideoContainer.tsx
+++ b/src/components/player/internals/VideoContainer.tsx
@@ -1,14 +1,36 @@
-import { useEffect, useRef } from "react";
+import { RefObject, useEffect, useRef } from "react";
 
+import { MWStreamType } from "@/backend/helpers/streams";
+import { SourceSliceSource } from "@/stores/player/slices/source";
+import { AllSlices } from "@/stores/player/slices/types";
 import { usePlayerStore } from "@/stores/player/store";
 
-export function VideoContainer() {
-  const player = usePlayerStore();
-  const videoEl = useRef<HTMLVideoElement>(null);
-
-  useEffect(() => {
-    if (videoEl.current) videoEl.current.src = player.source?.url ?? "";
-  }, [player.source?.url]);
-
-  return <video controls ref={videoEl} />;
+// should this video container show right now?
+function useShouldShow(source: SourceSliceSource | null): boolean {
+  if (!source) return false;
+  if (source.type !== MWStreamType.MP4) return false;
+  return true;
+}
+
+// make video element up to par with the state
+function useRestoreVideo(
+  videoRef: RefObject<HTMLVideoElement>,
+  player: AllSlices
+) {
+  useEffect(() => {
+    const el = videoRef.current;
+    const src = player.source?.url ?? "";
+    if (!el) return;
+    if (el.src !== src) el.src = src;
+  }, [player.source?.url, videoRef]);
+}
+
+export function VideoContainer() {
+  const videoEl = useRef<HTMLVideoElement>(null);
+  const player = usePlayerStore();
+  useRestoreVideo(videoEl, player);
+  const show = useShouldShow(player.source);
+
+  if (!show) return null;
+  return <video autoPlay ref={videoEl} />;
 }
diff --git a/src/stores/player/controllers/base.ts b/src/stores/player/controllers/base.ts
new file mode 100644
index 00000000..27021595
--- /dev/null
+++ b/src/stores/player/controllers/base.ts
@@ -0,0 +1,5 @@
+import { Controller } from "@/stores/player/controllers/types";
+
+function useBaseController(el: HTMLVideoElement): Controller {
+  return {};
+}
diff --git a/src/stores/player/controllers/types.ts b/src/stores/player/controllers/types.ts
new file mode 100644
index 00000000..32a30c81
--- /dev/null
+++ b/src/stores/player/controllers/types.ts
@@ -0,0 +1,6 @@
+export interface Controller {
+  pause(): void;
+  play(): void;
+  setVolume(target: number): void;
+  registerVideoElement(): void;
+}
diff --git a/src/stores/player/slices/source.ts b/src/stores/player/slices/source.ts
index 7504d83b..d62466ed 100644
--- a/src/stores/player/slices/source.ts
+++ b/src/stores/player/slices/source.ts
@@ -10,12 +10,14 @@ export const playerStatus = {
 
 export type PlayerStatus = ValuesOf<typeof playerStatus>;
 
+export interface SourceSliceSource {
+  url: string;
+  type: MWStreamType;
+}
+
 export interface SourceSlice {
   status: PlayerStatus;
-  source: {
-    url: string;
-    type: MWStreamType;
-  } | null;
+  source: SourceSliceSource | null;
   setStatus(status: PlayerStatus): void;
   setSource(url: string, type: MWStreamType): void;
 }
diff --git a/src/stores/video.ts b/src/stores/video.ts
deleted file mode 100644
index 9802896e..00000000
--- a/src/stores/video.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { create } from "zustand";
-
-export const useVideo = create(() => ({
-  
-}));