diff --git a/src/gcd_calculator.py b/src/gcd_calculator.py
new file mode 100644
index 0000000..32c27cc
--- /dev/null
+++ b/src/gcd_calculator.py
@@ -0,0 +1,95 @@
+def get_prime_factors(n):
+    """
+    Decompose a number into its prime factors.
+    
+    Args:
+        n (int): The number to factorize.
+    
+    Returns:
+        list: A list of prime factors.
+    
+    Raises:
+        ValueError: If input is not a positive integer.
+    """
+    # Validate input
+    if not isinstance(n, int):
+        raise ValueError("Input must be an integer")
+    
+    # Handle special cases
+    if n < 0:
+        n = abs(n)
+    
+    if n <= 1:
+        return []
+    
+    prime_factors = []
+    divisor = 2
+    
+    while divisor * divisor <= n:
+        if n % divisor == 0:
+            prime_factors.append(divisor)
+            n //= divisor
+        else:
+            divisor += 1
+    
+    # If n is still greater than 1, it's a prime factor itself
+    if n > 1:
+        prime_factors.append(n)
+    
+    return prime_factors
+
+def gcd_prime_factors(a, b):
+    """
+    Calculate the Greatest Common Divisor (GCD) using prime factorization.
+    
+    Args:
+        a (int): First number.
+        b (int): Second number.
+    
+    Returns:
+        int: The Greatest Common Divisor.
+    
+    Raises:
+        ValueError: If inputs are not integers.
+    """
+    # Validate inputs
+    if not isinstance(a, int) or not isinstance(b, int):
+        raise ValueError("Inputs must be integers")
+    
+    # Handle special cases
+    if a == 0 and b == 0:
+        raise ValueError("GCD is undefined when both numbers are zero")
+    
+    # Handle zero case
+    if a == 0:
+        return abs(b)
+    if b == 0:
+        return abs(a)
+    
+    # Get absolute values
+    a, b = abs(a), abs(b)
+    
+    # Get prime factors
+    a_factors = get_prime_factors(a)
+    b_factors = get_prime_factors(b)
+    
+    # Find common prime factors
+    gcd = 1
+    a_factor_count = {}
+    b_factor_count = {}
+    
+    # Count factors in a
+    for factor in a_factors:
+        a_factor_count[factor] = a_factor_count.get(factor, 0) + 1
+    
+    # Count factors in b
+    for factor in b_factors:
+        b_factor_count[factor] = b_factor_count.get(factor, 0) + 1
+    
+    # Calculate GCD by multiplying common factors
+    for factor, count in a_factor_count.items():
+        if factor in b_factor_count:
+            common_count = min(count, b_factor_count[factor])
+            gcd *= factor ** common_count
+    
+    return gcd
\ No newline at end of file
diff --git a/tests/test_gcd_calculator.py b/tests/test_gcd_calculator.py
new file mode 100644
index 0000000..1e46dda
--- /dev/null
+++ b/tests/test_gcd_calculator.py
@@ -0,0 +1,48 @@
+import pytest
+from src.gcd_calculator import get_prime_factors, gcd_prime_factors
+
+def test_get_prime_factors():
+    # Test basic prime factorization
+    assert get_prime_factors(12) == [2, 2, 3]
+    assert get_prime_factors(100) == [2, 2, 5, 5]
+    assert get_prime_factors(7) == [7]
+    assert get_prime_factors(1) == []
+    
+    # Test zero and negative numbers
+    assert get_prime_factors(0) == []
+    assert get_prime_factors(-12) == [2, 2, 3]
+
+def test_gcd_prime_factors():
+    # Test basic GCD calculations
+    assert gcd_prime_factors(48, 18) == 6
+    assert gcd_prime_factors(54, 24) == 6
+    assert gcd_prime_factors(17, 23) == 1
+    assert gcd_prime_factors(100, 75) == 25
+    
+    # Test with zero
+    assert gcd_prime_factors(0, 5) == 5
+    assert gcd_prime_factors(5, 0) == 5
+    
+    # Test with negative numbers
+    assert gcd_prime_factors(-48, 18) == 6
+    assert gcd_prime_factors(48, -18) == 6
+    assert gcd_prime_factors(-48, -18) == 6
+
+def test_gcd_error_handling():
+    # Test invalid inputs
+    with pytest.raises(ValueError, match="Inputs must be integers"):
+        gcd_prime_factors(3.14, 5)
+    
+    with pytest.raises(ValueError, match="Inputs must be integers"):
+        gcd_prime_factors("10", 5)
+    
+    with pytest.raises(ValueError, match="GCD is undefined when both numbers are zero"):
+        gcd_prime_factors(0, 0)
+
+def test_get_prime_factors_error_handling():
+    # Test invalid inputs
+    with pytest.raises(ValueError, match="Input must be an integer"):
+        get_prime_factors(3.14)
+    
+    with pytest.raises(ValueError, match="Input must be an integer"):
+        get_prime_factors("10")
\ No newline at end of file