diff --git a/src/main/java/Main.java b/src/main/java/Main.java
index 148a46e..4f80656 100644
--- a/src/main/java/Main.java
+++ b/src/main/java/Main.java
@@ -13,17 +13,21 @@ public class Main {
         if (input == null) {
             throw new IOException("products.csv not found");
         }
-        Scanner scanner = new Scanner(input);
+        try (Scanner scanner = new Scanner(input)) {
+            while (scanner.hasNextLine()) {
+                String line = scanner.nextLine();
+                if (line.trim().isEmpty()) continue;
 
-        // TODO:
-        // - Read each line from products.csv
-        // - For each line, parse productId, name, and price
-        // - The format of the file is like this:
-        //      [productId],[name],[price]
-        // - Store Product objects in the productCatalog ArrayList
+                String[] parts = line.split(",");
+                if (parts.length == 3) {
+                    int productId = Integer.parseInt(parts[0].trim());
+                    String name = parts[1].trim();
+                    double price = Double.parseDouble(parts[2].trim());
 
-        // NOTE
-        // - The data in products.csv is guaranteed to be valid.
+                    productCatalog.add(new Product(productId, name, price));
+                }
+            }
+        }
     }
 
     public static void main(String[] args)
@@ -44,3 +48,4 @@ public class Main {
         System.out.println("=== Report saved as report.txt");
     }
 }
+
diff --git a/src/main/java/ReportGenerator.java b/src/main/java/ReportGenerator.java
index 8eb458b..cc341f6 100644
--- a/src/main/java/ReportGenerator.java
+++ b/src/main/java/ReportGenerator.java
@@ -1,4 +1,6 @@
+import java.io.InputStream;
 import java.util.List;
+import java.util.Scanner;
 
 public class ReportGenerator {
 
@@ -15,69 +17,80 @@ public class ReportGenerator {
         this.productList = productList;
     }
 
-    public void processFile()
-    {
-        // TODO:
-        // 1. Open the order details CSV file
-        // 2. Read the file line by line
-        // 3. Split each line using comma delimiter
-        //      (each line is guaranteed to contain exactly two commas)
-        // 4. Each line contains exactly 3 values in the format:
-        //      [productId],[quantity],[discountPercent]
-        // 5. Attempt to convert values:
-        //      - productId -> int
-        //      - quantity -> int
-        //      - discountPercent -> int
-        //    NOTE:
-        //      - quantity and discountPercent may contain invalid characters
-        //        (e.g., letters instead of numbers).
-        //      - If parsing any value fails (NumberFormatException),
-        //        the entire line must be considered invalid.
-        //      - Use try-catch blocks and exception handling to safely
-        //        handle parsing and validation errors without stopping
-        //        the processing of the remaining lines.
-        // 6. Validate parsed values:
-        //      - productId must be greater than 0
-        //      - quantity must be greater than 0
-        //      - discountPercent must be between 0 and 99 inclusive
-        // 7. Look for a Product in productList that matches productId
-        // 8. If no Product with that ID exists in the catalog,
-        //      the entire line is considered invalid
-        // 9. If all values are valid and the product exists, calculate:
-        //      subtotal = quantity * product price
-        //      discountValue = subtotal * discountPercent / 100
-        //      finalCost = subtotal - discountValue
-        // 10. Update report totals:
-        //      - totalQuantity += quantity
-        //      - totalFinalCost += finalCost
-        //      - totalDiscountValue += discountValue
-        // 11. If any parsing error, validation failure, or missing product occurs:
-        //      - increment totalInvalidLines
-        //      - skip the line and continue processing the next line
-        // 12. Close all file resources
+    private Product findProduct(int productId) {
+        for (Product p : productList) {
+            if (p.getProductID() == productId) {
+                return p;
+            }
+        }
+        return null;
     }
 
-    public void saveReport()
-    {
-        // TODO:
-        // 1. Build a formatted report string
-        // 2. Include:
-        //      - total quantity
-        //      - total final cost
-        //      - total discount value
-        //      - total invalid lines
-        // 3. Create/open output report file (name it report.txt)
-        // 4. Write report string into file
-        // 5. Handle file writing exceptions
-        // 6. Close writer resources
+    public void processFile() {
+        java.io.File file = new java.io.File(ordersFilePath);
+        if (!file.exists()) {
+            System.out.println("Order file not found: " + file.getAbsolutePath());
+            return;
+        }
 
-        /* Example Structure
-        ========= SALES REPORT =========
-        Total Quantity Sold: 42
-        Total Final Cost: $1520.75
-        Total Discount Value: $230.50
-        Invalid Rows: 3
-        ================================
-        */
+        try (Scanner scanner = new Scanner(file)) {
+            while (scanner.hasNextLine()) {
+                String line = scanner.nextLine().trim();
+                if (line.isEmpty()) continue;
+
+                String[] parts = line.split(",");
+                if (parts.length != 3) {
+                    totalInvalidLines++;
+                    continue;
+                }
+
+                try {
+                    int productId = Integer.parseInt(parts[0].trim());
+                    int quantity = Integer.parseInt(parts[1].trim());
+                    int discountPercent = Integer.parseInt(parts[2].trim());
+
+                    if (quantity <= 0 || discountPercent < 0 || discountPercent > 99) {
+                        totalInvalidLines++;
+                        continue;
+                    }
+
+                    Product product = findProduct(productId);
+                    if (product == null) {
+                        totalInvalidLines++;
+                        continue;
+                    }
+
+                    double subtotal = quantity * product.getPrice();
+                    double discountValue = subtotal * discountPercent / 100.0;
+                    double finalCost = subtotal - discountValue;
+
+                    totalQuantity += quantity;
+                    totalFinalCost += finalCost;
+                    totalDiscountValue += discountValue;
+
+                } catch (NumberFormatException e) {
+                    totalInvalidLines++;
+                }
+            }
+        } catch (Exception e) {
+            System.out.println("Error processing file: " + e.getMessage());
+        }
     }
-}
\ No newline at end of file
+
+
+    public void saveReport() {
+        try (java.io.PrintWriter writer = new java.io.PrintWriter(new java.io.FileWriter("report.txt"))) {
+            writer.println("===== SALES REPORT =====");
+            writer.println();
+            writer.println("Total Quantity: " + totalQuantity);
+            writer.println("Total Final Cost: " + totalFinalCost);
+            writer.println("Total Discount Value: " + totalDiscountValue);
+            writer.println("Invalid Lines: " + totalInvalidLines);
+
+            System.out.println("Report successfully saved to report.txt");
+        } catch (java.io.IOException e) {
+            System.out.println("Error writing the report: " + e.getMessage());
+        }
+    }
+}
+