diff --git a/cpp/Makefile b/cpp/Makefile
index 81c8f71..3a3396a 100644
--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -3,7 +3,7 @@ all: test pathfinding
 # TODO linter?
 
 pathfinding: 
-	g++ -Wall -ggdb3 -lSDL3 -lSDL3_image -std=c++23 -lGLEW -lGL -o pathfinding src/main.cpp src/sprite.cpp src/entities.cpp src/gameloop.cpp src/map.cpp src/pathfindingdemo.cpp src/tile.cpp src/user_input.cpp
+	g++ -Wall -ggdb3 -lSDL3 -lSDL3_image -std=c++23 -lGLEW -lGL -o pathfinding src/main.cpp src/sprite.cpp src/entities.cpp src/gameloop.cpp src/map.cpp src/pathfindingdemo.cpp src/tile.cpp src/user_input.cpp src/window.cpp
 
 test: src/test.cpp src/array.hpp
 	g++ -Wall -Wextra -Wpedantic -ggdb3 -std=c++23 -lgtest -o test src/test.cpp
diff --git a/cpp/src/window.cpp b/cpp/src/window.cpp
index e69de29..363b771 100644
--- a/cpp/src/window.cpp
+++ b/cpp/src/window.cpp
@@ -0,0 +1,111 @@
+#include <GL/glew.h>
+#include <SDL3/SDL.h>
+#include <SDL3/SDL_opengl.h>
+#include <cmath>
+#include <cstdlib>
+#include <expected>
+#include <memory>
+#include <string>
+
+#include "window.hpp"
+
+#include "log.hpp"
+#include "math.hpp"
+#include "sprite.hpp"
+
+Window::Window(int width, int height) : m_Width(width), m_Height(height) {
+  LOG_DEBUG(".");
+}
+
+std::expected<void, std::string> Window::Init() {
+  LOG_DEBUG(".");
+
+  if (SDL_Init(SDL_INIT_VIDEO) == false) {
+    return std::unexpected(std::string("SDL could not initialize! Error: ") +
+                           SDL_GetError());
+  }
+  m_Window = SDL_CreateWindow("SDL2 Window", m_Width, m_Height,
+                              SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE);
+  if (m_Window == nullptr) {
+    std::atexit(SDL_Quit);
+    return std::unexpected(std::string("Window could not be created! Error: ") +
+                           SDL_GetError());
+  }
+
+  m_Context = SDL_GL_CreateContext(m_Window);
+  if (m_Context == nullptr) {
+    SDL_DestroyWindow(m_Window);
+    std::atexit(SDL_Quit);
+    return std::unexpected(
+        std::string("GL context could not be created! Error: ") +
+        SDL_GetError());
+  }
+
+  if (glewInit() != GLEW_OK) {
+    SDL_GL_DestroyContext(m_Context);
+    SDL_DestroyWindow(m_Window);
+    std::atexit(SDL_Quit);
+    return std::unexpected("GLEW init failed!");
+  }
+
+  // Resize();
+
+  m_Renderer = std::shared_ptr<SDL_Renderer>(SDL_CreateRenderer(m_Window, NULL),
+                                             SDL_DestroyRenderer);
+  if (m_Renderer == nullptr) {
+    SDL_DestroyWindow(m_Window);
+    std::atexit(SDL_Quit);
+    return std::unexpected(
+        std::string("Renderer could not be created! Error: ") + SDL_GetError());
+  }
+
+  // Set renderer to the Sprite class
+  Sprite::SetRenderer(m_Renderer);
+
+  // TODO this needs to be tied to map size
+  SDL_SetRenderScale(m_Renderer.get(), 1.0f, 1.0f);
+
+  return {};
+}
+
+Window::~Window() {
+  // SDL_DestroyRenderer(m_Renderer); // handled by shared_ptr
+  SDL_GL_DestroyContext(m_Context);
+  SDL_DestroyWindow(m_Window);
+  std::atexit(SDL_Quit);
+  LOG_DEBUG(".");
+}
+
+void Window::DrawSprite(const WorldPos &position, Sprite &s) {
+  WorldPos size = s.GetSize();
+  WorldPos img_center = s.GetCenter();
+  SDL_FRect rect = {position.x - img_center.x, position.y - img_center.y,
+                    size.x, size.y};
+  SDL_RenderTexture(m_Renderer.get(), s.GetTexture(), nullptr, &rect);
+}
+
+void Window::DrawRect(const WorldPos &position, const WorldPos size, uint8_t R,
+                      uint8_t G, uint8_t B, uint8_t A) {
+  SDL_FRect rect = {position.x, position.y, size.x, size.y};
+  SDL_SetRenderDrawColor(m_Renderer.get(), R, G, B, A);
+  SDL_RenderFillRect(m_Renderer.get(), &rect);
+}
+
+void Window::ClearWindow() {
+  SDL_SetRenderDrawColor(m_Renderer.get(), 50, 50, 50, 255);
+  SDL_RenderClear(m_Renderer.get());
+}
+
+void Window::Flush() { SDL_RenderPresent(m_Renderer.get()); }
+
+void Window::DrawCircle(const WorldPos &position, float radius) {
+  int cx = static_cast<int>(position.x);
+  int cy = static_cast<int>(position.y);
+  SDL_SetRenderDrawColor(m_Renderer.get(), 255, 0, 0, 255);
+  for (int i = 0; i < 360; ++i) {
+    double a = i * M_PI / 180.0;
+    SDL_RenderPoint(m_Renderer.get(),
+                    cx + static_cast<int>(std::round(radius * std::cos(a))),
+                    cy + static_cast<int>(std::round(radius * std::sin(a))));
+  }
+}
diff --git a/cpp/src/window.hpp b/cpp/src/window.hpp
index 2bcf8a7..9a291e6 100644
--- a/cpp/src/window.hpp
+++ b/cpp/src/window.hpp
@@ -4,118 +4,30 @@
 #include <SDL3/SDL.h>
 #include <SDL3/SDL_opengl.h>
 #include <cmath>
-#include <memory>
 #include <expected>
+#include <memory>
 #include <string>
-#include <cstdlib>
 
 #include "math.hpp"
 #include "sprite.hpp"
-#include "log.hpp"
-
 
 class Window {
 public:
+  Window(int width, int height);
+  ~Window();
+
   Window(const Window &x) = delete;
   Window(Window &&x) = delete;
-  Window(int width, int height) : m_Width(width), m_Height(height) {
-    LOG_DEBUG(".");
-  }
+  Window &operator=(const Window &) = delete;
+  Window &operator=(Window &&) = delete;
 
-  std::expected<void, std::string> Init() {
-    LOG_DEBUG(".");
-
-    if (SDL_Init(SDL_INIT_VIDEO) == false) {
-      return std::unexpected(std::string("SDL could not initialize! Error: ") +
-                             SDL_GetError());
-    }
-    m_Window = SDL_CreateWindow("SDL2 Window", m_Width, m_Height,
-                                SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE);
-    if (m_Window == nullptr) {
-      std::atexit(SDL_Quit);
-      return std::unexpected(
-          std::string("Window could not be created! Error: ") + SDL_GetError());
-    }
-
-    m_Context = SDL_GL_CreateContext(m_Window);
-    if (m_Context == nullptr) {
-      SDL_DestroyWindow(m_Window);
-      std::atexit(SDL_Quit);
-      return std::unexpected(
-          std::string("GL context could not be created! Error: ") +
-          SDL_GetError());
-    }
-
-    if (glewInit() != GLEW_OK) {
-      SDL_GL_DestroyContext(m_Context);
-      SDL_DestroyWindow(m_Window);
-      std::atexit(SDL_Quit);
-      return std::unexpected("GLEW init failed!");
-    }
-
-    // Resize();
-
-    m_Renderer = std::shared_ptr<SDL_Renderer>(
-        SDL_CreateRenderer(m_Window, NULL), SDL_DestroyRenderer);
-    if (m_Renderer == nullptr) {
-      SDL_DestroyWindow(m_Window);
-      std::atexit(SDL_Quit);
-      return std::unexpected(
-          std::string("Renderer could not be created! Error: ") +
-          SDL_GetError());
-    }
-
-    // Set renderer to the Sprite class
-    Sprite::SetRenderer(m_Renderer);
-
-    // TODO this needs to be tied to map size
-    SDL_SetRenderScale(m_Renderer.get(), 1.0f, 1.0f);
-
-    return {};
-  }
-
-  ~Window() {
-    // SDL_DestroyRenderer(m_Renderer); // handled by shared_ptr
-    SDL_GL_DestroyContext(m_Context);
-    SDL_DestroyWindow(m_Window);
-    std::atexit(SDL_Quit);
-    LOG_DEBUG(".");
-  }
-
-  void DrawSprite(const Vec2D<float> &position, Sprite &s) {
-    Vec2D<float> size = s.GetSize();
-    Vec2D<float> img_center = s.GetCenter();
-    SDL_FRect rect = {position.x - img_center.x, position.y - img_center.y,
-                      size.x, size.y};
-    SDL_RenderTexture(m_Renderer.get(), s.GetTexture(), nullptr, &rect);
-  }
-
-  void DrawRect(const Vec2D<float> &position, const Vec2D<float> size,
-                uint8_t R, uint8_t G, uint8_t B, uint8_t A) {
-    SDL_FRect rect = {position.x, position.y,
-                      size.x, size.y};
-    SDL_SetRenderDrawColor(m_Renderer.get(), R, G, B, A);
-    SDL_RenderFillRect(m_Renderer.get(), &rect);
-  }
-
-  void ClearWindow() {
-    SDL_SetRenderDrawColor(m_Renderer.get(), 50, 50, 50, 255);
-    SDL_RenderClear(m_Renderer.get());
-  }
-
-  void Flush() { SDL_RenderPresent(m_Renderer.get()); }
-
-  void DrawCircle(const Vec2D<float> &position, float radius) {
-    int cx = static_cast<int>(position.x);
-    int cy = static_cast<int>(position.y);
-    SDL_SetRenderDrawColor(m_Renderer.get(), 255, 0, 0, 255);
-    for (int i = 0; i < 360; ++i) {
-      double a = i * M_PI / 180.0;
-      SDL_RenderPoint(m_Renderer.get(),
-                      cx + static_cast<int>(std::round(radius * std::cos(a))),
-                      cy + static_cast<int>(std::round(radius * std::sin(a))));
-    }
-  }
+  std::expected<void, std::string> Init();
+  void DrawSprite(const WorldPos &position, Sprite &s);
+  void DrawRect(const WorldPos &position, const WorldPos size, uint8_t R,
+                uint8_t G, uint8_t B, uint8_t A);
+  void ClearWindow();
+  void Flush();
+  void DrawCircle(const WorldPos &position, float radius);
 
   std::shared_ptr<SDL_Renderer> m_Renderer = nullptr;
   SDL_Window *m_Window;