diff --git a/src/events/character/Move.ts b/src/events/character/Move.ts
index f3fb066..1a35900 100644
--- a/src/events/character/Move.ts
+++ b/src/events/character/Move.ts
@@ -1,79 +1,101 @@
-import { Server } from 'socket.io'
-import { TSocket } from '../../utilities/Types'
-import ZoneManager from '../../managers/ZoneManager'
-import prisma from '../../utilities/Prisma'
-import AStar from '../../utilities/Player/AStar'
-import Rotation from '../../utilities/Player/Rotation'
+import { Server } from 'socket.io';
+import { TSocket } from '../../utilities/Types';
+import ZoneManager from '../../managers/ZoneManager';
+import prisma from '../../utilities/Prisma';
+import AStar, { type Node } from '../../utilities/Player/AStar';
+import Rotation from '../../utilities/Player/Rotation';
 
-type SocketResponseT = {
-  position_x: number
-  position_y: number
+interface SocketResponse {
+  position_x: number;
+  position_y: number;
 }
 
-export default function (socket: TSocket, io: Server) {
-  socket.on('character:move', async (data: SocketResponseT) => {
+interface Character {
+  id: number;
+  position_x: number;
+  position_y: number;
+  rotation: number;
+  zoneId: number;
+}
+
+export default function setupCharacterMove(socket: TSocket, io: Server) {
+  socket.on('character:move', async (data: SocketResponse) => {
     try {
-      console.log('character:move requested', data)
+      console.log('character:move requested', data);
 
       if (!socket.character) {
-        console.log('character:move error', 'Character not found')
-        return
+        console.error('character:move error', 'Character not found');
+        return;
       }
 
-      const start = {
-        x: socket.character.position_x,
-        y: socket.character.position_y,
-        g: 0,
-        h: 0,
-        f: 0
-      }
-      const end = {
-        x: data.position_x,
-        y: data.position_y,
-        g: 0,
-        h: 0,
-        f: 0
-      }
-
-      const grid = await ZoneManager.getGrid(socket.character.zoneId)
+      const grid = await ZoneManager.getGrid(socket.character.zoneId);
 
       if (grid.length === 0) {
-        console.log('character:move error', 'Grid not found')
-        return
+        console.error('character:move error', 'Grid not found');
+        return;
       }
 
-      const path = AStar.findPath(start, end, grid)
+      const start = { x: socket.character.position_x, y: socket.character.position_y };
+      const end = { x: data.position_x, y: data.position_y };
+
+      console.log('Starting position:', start);
+      console.log('Target position:', end);
+      console.log('Grid:', grid);
+
+      const path = AStar.findPath(start, end, grid);
+
+      console.log('Calculated path:', path);
 
       if (path.length > 0) {
-        const finalPosition = path[path.length - 1]
-
-        // Calculate the rotation
-        const rotation = Rotation.calculate(socket.character.position_x, socket.character.position_y, finalPosition.x, finalPosition.y)
-
-        socket.character.position_x = finalPosition.x
-        socket.character.position_y = finalPosition.y
-        socket.character.rotation = rotation // Assuming character has a rotation property
-
-        await prisma.character.update({
-          where: {
-            id: socket.character.id
-          },
-          data: {
-            position_x: finalPosition.x,
-            position_y: finalPosition.y,
-            rotation: rotation // Update the rotation in the database
-          }
-        })
-
-        ZoneManager.updateCharacterInZone(socket.character.zoneId, socket.character)
-        io.in(socket.character.zoneId.toString()).emit('character:moved', socket.character)
-
-        console.log(socket.character)
+        await moveAlongPath(socket, io, path, grid);
       } else {
-        console.log('character:move error', 'No valid path found')
+        console.log('character:move error', 'No valid path found');
       }
     } catch (error) {
-      console.log('character:move error', error)
+      console.error('character:move error', error);
     }
-  })
+  });
 }
+
+async function moveAlongPath(socket: TSocket, io: Server, path: Node[], grid: number[][]) {
+  if (!socket.character) return;
+
+  for (const position of path) {
+    if (isObstacle(position, grid)) {
+      console.log('Obstacle encountered at', position);
+      break;
+    }
+
+    const rotation = Rotation.calculate(
+      socket.character.position_x,
+      socket.character.position_y,
+      position.x,
+      position.y
+    );
+
+    await updateCharacterPosition(socket.character, position.x, position.y, rotation);
+
+    ZoneManager.updateCharacterInZone(socket.character.zoneId, socket.character);
+    io.in(socket.character.zoneId.toString()).emit('character:moved', socket.character);
+
+    console.log('Character moved to', position);
+
+    // Add a small delay between moves to avoid overwhelming the server
+    await new Promise(resolve => setTimeout(resolve, 100));
+  }
+}
+
+function isObstacle(position: Node, grid: number[][]): boolean {
+  return grid[position.y][position.x] === 1;
+}
+
+async function updateCharacterPosition(character: Character, x: number, y: number, rotation: number) {
+  character.position_x = x;
+  character.position_y = y;
+  character.rotation = rotation;
+
+  await prisma.character.update({
+    where: { id: character.id },
+    data: { position_x: x, position_y: y, rotation }
+  });
+}
\ No newline at end of file
diff --git a/src/managers/ZoneManager.ts b/src/managers/ZoneManager.ts
index 29f558f..bb44f31 100644
--- a/src/managers/ZoneManager.ts
+++ b/src/managers/ZoneManager.ts
@@ -1,132 +1,124 @@
-import { Character, Zone } from '@prisma/client'
-import ZoneRepository from '../repositories/ZoneRepository'
-import ZoneService from '../services/ZoneService'
-import zoneRepository from '../repositories/ZoneRepository'
+import { Character, Zone } from '@prisma/client';
+import ZoneRepository from '../repositories/ZoneRepository';
+import ZoneService from '../services/ZoneService';
+import zoneRepository from '../repositories/ZoneRepository';
 
 type TLoadedZone = {
-  zone: Zone
-  characters: Character[]
-}
+  zone: Zone,
+  characters: Character[],
+  grid: number[][]
+};
 
 class ZoneManager {
-  private loadedZones: TLoadedZone[] = []
+  private loadedZones: TLoadedZone[] = [];
 
   // Method to initialize zone manager
   public async boot() {
     if (!(await ZoneRepository.getById(1))) {
-      const zoneService = new ZoneService()
-      await zoneService.createDemoZone()
+      const zoneService = new ZoneService();
+      await zoneService.createDemoZone();
     }
 
-    const zones = await ZoneRepository.getAll()
+    const zones = await ZoneRepository.getAll();
 
     for (const zone of zones) {
-      this.loadZone(zone)
+      await this.loadZone(zone);
     }
 
-    console.log('[✅] Zone manager loaded')
+    console.log('[✅] Zone manager loaded');
   }
 
   // Method to handle individual zone loading
-  public loadZone(zone: Zone) {
+  public async loadZone(zone: Zone) {
+    const grid = await this.getGrid(zone.id); // Create the grid for the zone
     this.loadedZones.push({
       zone,
-      characters: []
-    })
-    console.log(`[✅] Zone ID ${zone.id} loaded`)
+      characters: [],
+      grid
+    });
+    console.log(`[✅] Zone ID ${zone.id} loaded`);
   }
 
   // Method to handle individual zone unloading
   public unloadZone(zoneId: number) {
     this.loadedZones = this.loadedZones.filter((loadedZone) => {
-      return loadedZone.zone.id !== zoneId
-    })
-    console.log(`[❌] Zone ID ${zoneId} unloaded`)
+      return loadedZone.zone.id !== zoneId;
+    });
+    console.log(`[❌] Zone ID ${zoneId} unloaded`);
   }
 
   // Getter for loaded zones
   public getLoadedZones(): TLoadedZone[] {
-    return this.loadedZones
+    return this.loadedZones;
+  }
+
+  // Check if position is walkable
+  private isPositionWalkable(zoneId: number, x: number, y: number): boolean {
+    const loadedZone = this.loadedZones.find((lz) => lz.zone.id === zoneId);
+    return loadedZone ? loadedZone.grid[y][x] === 0 : false;
   }
 
   public addCharacterToZone(zoneId: number, character: Character) {
     const loadedZone = this.loadedZones.find((loadedZone) => {
-      return loadedZone.zone.id === zoneId
-    })
-    if (loadedZone) {
-      loadedZone.characters.push(character)
+      return loadedZone.zone.id === zoneId;
+    });
+    if (loadedZone && this.isPositionWalkable(zoneId, character.position_x, character.position_y)) {
+      loadedZone.characters.push(character);
     }
   }
 
   public removeCharacterFromZone(zoneId: number, character: Character) {
     const loadedZone = this.loadedZones.find((loadedZone) => {
-      return loadedZone.zone.id === zoneId
-    })
+      return loadedZone.zone.id === zoneId;
+    });
     if (loadedZone) {
       loadedZone.characters = loadedZone.characters.filter((loadedCharacter) => {
-        return loadedCharacter.id !== character.id
-      })
+        return loadedCharacter.id !== character.id;
+      });
     }
   }
 
   public updateCharacterInZone(zoneId: number, character: Character) {
     const loadedZone = this.loadedZones.find((loadedZone) => {
-      return loadedZone.zone.id === zoneId
-    })
+      return loadedZone.zone.id === zoneId;
+    });
     if (loadedZone) {
       const characterIndex = loadedZone.characters.findIndex((loadedCharacter) => {
-        return loadedCharacter.id === character.id
-      })
+        return loadedCharacter.id === character.id;
+      });
       if (characterIndex !== -1) {
-        loadedZone.characters[characterIndex] = character
+        loadedZone.characters[characterIndex] = character;
       }
     }
   }
 
   public getCharactersInZone(zoneId: number): Character[] {
     const loadedZone = this.loadedZones.find((loadedZone) => {
-      return loadedZone.zone.id === zoneId
-    })
-    return loadedZone ? loadedZone.characters : []
+      return loadedZone.zone.id === zoneId;
+    });
+    return loadedZone ? loadedZone.characters : [];
   }
 
   public async getGrid(zoneId: number): Promise<number[][]> {
-    const zone = this.loadedZones.find((z) => z.zone.id === zoneId)
-    let grid: number[][] = []
-    if (zone) {
-      const eventTiles = await zoneRepository.getEventTiles(zoneId)
-      const objects = await zoneRepository.getObjects(zoneId)
+    const zone = this.loadedZones.find((z) => z.zone.id === zoneId);
+    if (zone) return zone.grid;
 
-      // Create a grid based on the event tiles
-      for (let i = 0; i < zone.zone.width; i++) {
-        grid.push(Array(zone.zone.height).fill(0))
+    const loadedZone = await ZoneRepository.getById(zoneId);
+    if (!loadedZone) return [];
+
+    let grid: number[][] = Array.from({ length: loadedZone.height }, () => Array.from({ length: loadedZone.width }, () => 0));
+
+    const eventTiles = await zoneRepository.getEventTiles(zoneId);
+
+    // Set the grid values based on the event tiles, these are strings
+    eventTiles.forEach((eventTile) => {
+      if (eventTile.type === 'BLOCK') {
+        grid[eventTile.position_y][eventTile.position_x] = 1;
       }
+    });
 
-      // Set the grid values based on the event tiles, these are strings
-      eventTiles.forEach((eventTile) => {
-        if (eventTile.type === 'BLOCK') {
-          grid[eventTile.position_x][eventTile.position_y] = 0
-        } else if (eventTile.type === 'WARP') {
-          grid[eventTile.position_x][eventTile.position_y] = 1
-        } else if (eventTile.type === 'NPC') {
-          grid[eventTile.position_x][eventTile.position_y] = 2
-        } else if (eventTile.type === 'ITEM') {
-          grid[eventTile.position_x][eventTile.position_y] = 3
-        }
-      });
-
-      objects.forEach((object) => {
-        if (object.objectId === 'blank_tile') {
-          grid[object.position_x][object.position_y] = 0
-        } else {
-          grid[object.position_x][object.position_y] = 1
-        }
-      });
-
-      return grid
-    }
-    return []
+    return grid;
   }
 }
 
-export default new ZoneManager()
+export default new ZoneManager();
diff --git a/src/utilities/Player/AStar.ts b/src/utilities/Player/AStar.ts
index 2da8cf1..0cda4ae 100644
--- a/src/utilities/Player/AStar.ts
+++ b/src/utilities/Player/AStar.ts
@@ -1,84 +1,183 @@
-// utilities/AStar.ts
-
-type Node = {
-  x: number
-  y: number
-  parent?: Node
-  g: number
-  h: number
-  f: number
+interface Position {
+  x: number;
+  y: number;
 }
 
-class AStar {
-  static findPath(start: Node, end: Node, grid: number[][]): Node[] {
-    // Initialize the open and closed lists
-    let openList: Node[] = []
-    let closedList: Node[] = []
+export interface Node extends Position {
+  parent?: Node;
+  g: number;
+  h: number;
+  f: number;
+}
 
-    // Push the start node onto the open list
-    openList.push(start)
+/**
+ * A* pathfinding algorithm.
+ */
+class AStar {
+  private static readonly ORTHOGONAL_DIRECTIONS: Position[] = [
+    { x: 0, y: -1 }, // up
+    { x: 0, y: 1 },  // down
+    { x: -1, y: 0 }, // left
+    { x: 1, y: 0 }   // right
+  ];
+
+  private static readonly DIAGONAL_DIRECTIONS: Position[] = [
+    { x: -1, y: -1 }, // up-left
+    { x: -1, y: 1 },  // down-left
+    { x: 1, y: -1 },  // up-right
+    { x: 1, y: 1 }    // down-right
+  ];
+
+  /**
+   * Finds the shortest path from start to end on the given grid.
+   * @param start - Start position.
+   * @param end - End position.
+   * @param grid - The grid representing the map (0 = open space, 1 = obstacle).
+   * @param allowDiagonal - Whether diagonal movements are allowed.
+   * @returns Array of `Node` representing the path from start to end.
+   */
+  static findPath(start: Position, end: Position, grid: number[][], allowDiagonal: boolean = false): Node[] {
+    const openList: Node[] = [];
+    const closedSet = new Set<string>();
+
+    const startNode: Node = { ...start, g: 0, h: 0, f: 0 };
+    openList.push(startNode);
 
     while (openList.length > 0) {
-      // Get the node with the lowest f value
-      let currentNode = openList.reduce((prev, curr) => (prev.f < curr.f ? prev : curr))
+      const currentNode = this.getLowestFScoreNode(openList);
 
-      // Move the current node to the closed list
-      openList = openList.filter((node) => node !== currentNode)
-      closedList.push(currentNode)
-
-      // Check if we've reached the end
-      if (currentNode.x === end.x && currentNode.y === end.y) {
-        let path: Node[] = []
-        let curr = currentNode
-        while (curr) {
-          path.push(curr)
-          curr = curr.parent as Node
-        }
-        return path.reverse()
+      if (this.isEndNode(currentNode, end)) {
+        return this.reconstructPath(currentNode);
       }
 
-      // Get the neighboring nodes
-      let neighbors = this.getNeighbors(currentNode, grid)
-      for (let neighbor of neighbors) {
-        if (closedList.some((node) => node.x === neighbor.x && node.y === neighbor.y)) {
-          continue
-        }
+      this.removeNodeFromOpenList(openList, currentNode);
+      closedSet.add(this.nodeToString(currentNode));
 
-        neighbor.g = currentNode.g + 1
-        neighbor.h = Math.abs(neighbor.x - end.x) + Math.abs(neighbor.y - end.y)
-        neighbor.f = neighbor.g + neighbor.h
-        neighbor.parent = currentNode
+      for (const neighbor of this.getValidNeighbors(currentNode, grid, end, allowDiagonal)) {
+        if (closedSet.has(this.nodeToString(neighbor))) continue;
 
-        if (!openList.some((node) => node.x === neighbor.x && node.y === neighbor.y)) {
-          openList.push(neighbor)
+        const tentativeGScore = currentNode.g + this.getDistance(currentNode, neighbor);
+
+        if (!this.isInOpenList(openList, neighbor) || tentativeGScore < neighbor.g) {
+          neighbor.parent = currentNode;
+          neighbor.g = tentativeGScore;
+          neighbor.h = this.heuristic(neighbor, end);
+          neighbor.f = neighbor.g + neighbor.h;
+
+          if (!this.isInOpenList(openList, neighbor)) {
+            openList.push(neighbor);
+          }
         }
       }
     }
 
-    // No path found
-    return []
+    return []; // No path found
   }
 
-  private static getNeighbors(node: Node, grid: number[][]): Node[] {
-    let neighbors: Node[] = []
-    let directions = [
-      { x: 0, y: -1 },
-      { x: 0, y: 1 },
-      { x: -1, y: 0 },
-      { x: 1, y: 0 }
-    ]
+  /**
+   * Gets the node with the lowest F score from a list.
+   */
+  private static getLowestFScoreNode(nodes: Node[]): Node {
+    return nodes.reduce((min, node) => (node.f < min.f ? node : min));
+  }
 
-    for (let direction of directions) {
-      let x = node.x + direction.x
-      let y = node.y + direction.y
+  /**
+   * Checks if the given node is the end node.
+   */
+  private static isEndNode(node: Node, end: Position): boolean {
+    return node.x === end.x && node.y === end.y;
+  }
 
-      if (x >= 0 && y >= 0 && x < grid.length && y < grid[0].length && grid[x][y] === 0) {
-        neighbors.push({ x, y, g: 0, h: 0, f: 0 })
-      }
+  /**
+   * Removes a node from the open list.
+   */
+  private static removeNodeFromOpenList(openList: Node[], node: Node): void {
+    const index = openList.findIndex(n => n.x === node.x && n.y === node.y);
+    if (index !== -1) openList.splice(index, 1);
+  }
+
+  /**
+   * Converts a node to a string representation.
+   */
+  private static nodeToString(node: Position): string {
+    return `${node.x},${node.y}`;
+  }
+
+  /**
+   * Gets valid neighbors of the given node.
+   */
+  private static getValidNeighbors(node: Node, grid: number[][], end: Position, allowDiagonal: boolean): Node[] {
+    const directions = allowDiagonal
+      ? [...this.ORTHOGONAL_DIRECTIONS, ...this.DIAGONAL_DIRECTIONS]
+      : this.ORTHOGONAL_DIRECTIONS;
+
+    return directions
+      .map((dir) => ({
+        x: node.x + dir.x,
+        y: node.y + dir.y,
+        g: 0,
+        h: 0,
+        f: 0
+      }))
+      .filter((pos) => this.isValidPosition(pos, grid, end)) as Node[];
+  }
+
+  /**
+   * Checks if the given position is valid.
+   */
+  private static isValidPosition(pos: Position, grid: number[][], end: Position): boolean {
+    const { x, y } = pos;
+    return (
+      x >= 0 && y >= 0 &&
+      x < grid.length && y < grid[0].length &&
+      (grid[y][x] === 0 || (x === end.x && y === end.y))
+    );
+  }
+
+  /**
+   * Checks if the given node is in the open list.
+   */
+  private static isInOpenList(openList: Node[], node: Position): boolean {
+    return openList.some((n) => n.x === node.x && n.y === node.y);
+  }
+
+  /**
+   * Gets the distance between two positions.
+   */
+  private static getDistance(a: Position, b: Position): number {
+    const dx = Math.abs(a.x - b.x);
+    const dy = Math.abs(a.y - b.y);
+
+    if (a.x === b.x || a.y === b.y) {
+      // Orthogonal movement (horizontal/vertical)
+      return Math.sqrt(dx * dx + dy * dy);
+    } else {
+      // Diagonal movement with cost sqrt(2)
+      return Math.sqrt(dx * dx + dy * dy);
+    }
+  }
+
+  /**
+   * Heuristic function estimating the distance from a node to the goal.
+   */
+  private static heuristic(node: Position, goal: Position): number {
+    return this.getDistance(node, goal);
+  }
+
+  /**
+   * Reconstructs the path from the end node.
+   */
+  private static reconstructPath(endNode: Node): Node[] {
+    const path: Node[] = [];
+    let currentNode: Node | undefined = endNode;
+
+    while (currentNode) {
+      path.unshift(currentNode);
+      currentNode = currentNode.parent;
     }
 
-    return neighbors
+    return path;
   }
 }
 
-export default AStar
+export default AStar;
\ No newline at end of file