diff --git a/src/logic/move.py b/src/logic/move.py
index d7d7b73..f54034c 100644
--- a/src/logic/move.py
+++ b/src/logic/move.py
@@ -2,9 +2,17 @@
 from logic.position import Position
 from enum import Enum
 
+class CastleSide(Enum):
+    Neither = ""
+    King = "O-O"
+    Queen = "O-O-O"
+
 class Move:
-    def __init__(self, is_capturing: bool) -> None:
+    def __init__(self, piece: "Piece", pos: Position,/, is_capturing: bool = False, castle_side: CastleSide = CastleSide.Neither) -> None:
+        self.piece = piece
+        self.pos = pos
         self.is_capturing = is_capturing
+        self.castle_side = castle_side
 
     def to_algebraic(self) -> str:
         raise NotImplementedError("The move can't be translated to algbraic notation, as it was not implemented")
@@ -13,13 +21,18 @@ class Move:
     def from_algebraic(move: str) -> "Move":
         raise NotImplementedError("The move can't be translated from algbraic notation, as it was not implemented")
 
+    def __str__(self) -> str:
+        if self.castle_side == CastleSide.King:
+            return "O-O"
+        if self.castle_side == CastleSide.Queen:
+            return "O-O-O"
 
-class PieceMove(Move):
-    def __init__(self, piece: "Piece", pos: Position,/, is_capturing: bool = False) -> None:
-        super().__init__(is_capturing)
-        self.piece = piece
-        self.pos = pos
+        ret = ""
+        if type(self.piece).__name__ != "Pawn":
+            ret += self.piece.letter().upper()
 
-class Castle(Move, Enum):
-    KING_SIDE_CASTLE = False
-    QUEEN_SIDE_CASTLE = False
+        ret += str(self.pos)
+        return ret
+    
+    def __repr__(self) -> str:
+        return str(self)
diff --git a/src/logic/pieces/knight.py b/src/logic/pieces/knight.py
index 1386c24..9aac2d2 100644
--- a/src/logic/pieces/knight.py
+++ b/src/logic/pieces/knight.py
@@ -1,6 +1,9 @@
 from .piece import Piece
 
 class Knight(Piece):
+    def letter(self):
+        return "n"
+
     def legal_moves(self, board: "Board") -> list["Move"]:
         ret = []
         for dx, dy in [
diff --git a/src/logic/pieces/pawn.py b/src/logic/pieces/pawn.py
index bb89667..8574984 100644
--- a/src/logic/pieces/pawn.py
+++ b/src/logic/pieces/pawn.py
@@ -1,4 +1,4 @@
-from logic.move import Move, PieceMove
+from logic.move import Move
 from logic.pieces.piece import Colour, Piece
 from logic.position import Position
 
@@ -13,7 +13,7 @@ class Pawn(Piece):
             (self.colour == Colour.BLACK and (capturable_piece := board.piece_at(self.pos.x - 1, self.pos.y - 1)))
         ):
             if capturable_piece.colour != self.colour:
-                ret.append(PieceMove(self, capturable_piece.pos, is_capturing = True))
+                ret.append(Move(self, capturable_piece.pos, is_capturing = True))
 
         # can we capture to the right?
         if self.pos.x < 7 and (
@@ -22,19 +22,19 @@ class Pawn(Piece):
             (self.colour == Colour.BLACK and (capturable_piece := board.piece_at(self.pos.x + 1, self.pos.y - 1)))
         ):
             if capturable_piece.colour != self.colour:
-                ret.append(PieceMove(self, capturable_piece.pos, is_capturing = True))
+                ret.append(Move(self, capturable_piece.pos, is_capturing = True))
 
         if self.colour == Colour.WHITE:
             for dy in range(1, 3 if self.pos.y == 1 else 2):
                 if self.pos.y + dy > 7 or board.piece_at(self.pos.x, self.pos.y + dy):
                     break
                 pos = Position(self.pos.x, self.pos.y + dy)
-                ret.append(PieceMove(self, pos))
+                ret.append(Move(self, pos))
         else:
             for dy in range(1, 3 if self.pos.y == 6 else 2):
                 if self.pos.y - dy < 0 or board.piece_at(self.pos.x, self.pos.y - dy):
                     break
                 pos = Position(self.pos.x, self.pos.y - dy)
-                ret.append(PieceMove(self, pos))
+                ret.append(Move(self, pos))
 
         return ret
diff --git a/src/logic/pieces/piece.py b/src/logic/pieces/piece.py
index ab9ec66..bd0741c 100644
--- a/src/logic/pieces/piece.py
+++ b/src/logic/pieces/piece.py
@@ -1,4 +1,4 @@
-from logic.move import Move, PieceMove
+from logic.move import Move
 from logic.position import Position
 from enum import Enum
 
@@ -13,6 +13,9 @@ class Piece:
         assert colour == Colour.WHITE or colour == Colour.BLACK, "The colour of the piece must be either Piece.WHITE or Piece.BLACK"
         self.colour = colour
 
+    def letter(self):
+        return type(self).__name__[0].lower()
+
     def _look_direction(self, board: "Board", mult_dx: int, mult_dy: int):
         ret = []
         for d in range(1, 8):
@@ -34,10 +37,10 @@ class Piece:
         piece = board.piece_at(x, y) 
 
         if piece is None:
-            return PieceMove(self, Position(x, y))
+            return Move(self, Position(x, y))
 
         if piece.colour != self.colour:
-            return PieceMove(self, Position(x, y), is_capturing=True)
+            return Move(self, Position(x, y), is_capturing=True)
         return None
 
     def position(self) -> Position:
diff --git a/src/logic/position.py b/src/logic/position.py
index 48724ce..837c8b3 100644
--- a/src/logic/position.py
+++ b/src/logic/position.py
@@ -29,8 +29,7 @@ class Position:
         return hash((self.x, self.y))
 
     def __str__(self) -> str:
-        return f"{self.x, self.y}"
+        return f"{Position._FILES[self.x]}{Position._RANKS[self.y]}"
 
     def __repr__(self) -> str:
         return str(self)
-