diff --git a/solutions/binarydecimalconversion.py b/solutions/binarydecimalconversion.py
index e69de29bb..1de9e58c8 100644
--- a/solutions/binarydecimalconversion.py
+++ b/solutions/binarydecimalconversion.py
@@ -0,0 +1,87 @@
+"""
+A module for converting between binary and decimal numbers. 
+Created by Muna Sattouf on 29/12/2024
+Completed on 1/1/2025
+"""
+def DecimalToBinary(decimal: int)-> str:
+    """
+    This function takes a decimal number from command line as paramter,
+    and returns its binary representation.
+    
+    Example: DecimalToBinary('binary', 392)
+    >>> 110001000
+    
+    """
+    if not isinstance(decimal, int):
+        raise ValueError("Input must be an integer")
+    if decimal < 0:
+        decimal = -decimal
+        return '-'+ DecimalToBinary(decimal)
+    if decimal == 0:
+        return 0
+    binarynumber = ' '
+    while decimal > 0:
+        binarynumber = str(decimal % 2)+ binarynumber
+        decimal = decimal // 2
+    return binarynumber
+
+def BinaryToDecimal(binary: str)-> int:
+    """
+    This function takes a binary number from command line as paramter,
+    and returns its decimal representation.
+    
+    Example: BinaryToDecimal('decimal', 10011101)
+    >>> 157
+    """
+    if not all(c in '01' for c in binary):
+        raise ValueError("Input must only contain 0s and 1s")
+    decimalnumber = 0
+    for c in binary:
+        decimalnumber = decimalnumber*2 + int(c)
+    return decimalnumber
+
+def binarydecimalconversion(conversion_type: str, number:str)-> str:
+    """
+    This is the main function: It 'coordinates' and decides
+    which of the two above functions to use
+    """
+    if conversion_type == "decimal":
+        if not all(c in '01' for c in number):
+            raise ValueError("If decimal conversion, input must be in binary, consisting only of 0 and 1")
+        return BinaryToDecimal(number)
+    elif conversion_type == "binary":
+        if not number.isdigit():
+            raise ValueError("If binary conversion, input must be a positive integer")
+        decimal = int(number)
+        return DecimalToBinary(decimal)
+    else: 
+        raise ValueError("Conversion Type must be 'binary' or 'decimal ' ")
+    
+if __name__== "__main__":
+
+    import sys
+    if len(sys.argv)!=3:
+        print("To use properly, the first argument is conversion type. the second is the number you want to convert.")
+        sys.exit(1)
+        
+    conversion_type = sys.argv[1].lower()
+    number = sys.argv[2]
+    
+    if conversion_type not in ["binary", "decimal"]:
+        print("Error: Conversion type must be binary or decimal")
+        sys.exit(1)
+        
+    if conversion_type == 'decimal':
+        if not all(c in '01' for c in number):
+            print("Error: for decimal conversion, input must be in binary, containing only 1 and 0")
+            sys.exit(1)
+        result = BinaryToDecimal(number)
+        
+    elif conversion_type == 'binary':
+        if not number.isdigit():
+            print("Error: for binary conversion, input must be positive integer")
+            sys.exit(1)
+        result =  DecimalToBinary(int(number))
+        
+    print(result)
+    
\ No newline at end of file