diff --git a/Piece.cpp b/Piece.cpp
index 7a436d0..43c0489 100644
--- a/Piece.cpp
+++ b/Piece.cpp
@@ -2,10 +2,7 @@
 
 #include <ostream>
 
-Piece::Piece(PieceColor color, PieceType type)
-{
-    (void)color;
-    (void)type;
+Piece::Piece(PieceColor color, PieceType type) : _color(color), _type(type) {
 }
 
 Piece::Optional Piece::fromSymbol(char symbol) {
@@ -14,11 +11,11 @@ Piece::Optional Piece::fromSymbol(char symbol) {
 }
 
 PieceColor Piece::color() const {
-    return PieceColor::Black;
+    return _color;
 }
 
 PieceType Piece::type() const {
-    return PieceType::Pawn;
+    return _type;
 }
 
 bool operator==(const Piece &lhs, const Piece &rhs) {
diff --git a/Piece.hpp b/Piece.hpp
index 3fde367..b8851b5 100644
--- a/Piece.hpp
+++ b/Piece.hpp
@@ -19,6 +19,10 @@ enum class PieceType {
 };
 
 class Piece {
+
+    const PieceColor _color;
+    const PieceType _type;
+
 public:
 
     using Optional = std::optional<Piece>;