Added Enum for Pieces
merge fix
merge