diff --git a/src/main/java/Main.java b/src/main/java/Main.java
index 473dd4d..e292cb0 100644
--- a/src/main/java/Main.java
+++ b/src/main/java/Main.java
@@ -8,7 +8,7 @@ public class Main {
         try {
             // Instantiate the parser
             Parser parser = new Parser(filePath);
-            
+
             // TODO: You can test your code here before you run the unit tests.
             // Example: Call your sorting methods, iterate through the returned list,
             // and print out the movies to see if they match the expected results in the Help folder.
diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java
index 516cf14..d74bbb8 100644
--- a/src/main/java/Parser.java
+++ b/src/main/java/Parser.java
@@ -15,38 +15,38 @@ public class Parser {
 
     public List<Movie> sortByTitle() {
         List<Movie> sortedByTitle = new ArrayList<>(movies);
-        // TODO: Sort the 'sortedByTitle' list alphabetically by the movie's title.
-        // Hint: You can use Collections.sort() or the List.sort() method along with a custom Comparator.
-        // Example: Comparator.comparing(Movie::getTitle)
+        sortedByTitle.sort(Comparator.comparing(Movie::getTitle));
         return sortedByTitle;
     }
 
     public List<Movie> sortByRating() {
         List<Movie> sortedByRating = new ArrayList<>(movies);
-        // TODO: Sort the 'sortedByRating' list by the movie's rating in descending order (highest to lowest).
-        // Hint: Use Double.compare() in your Comparator or Comparator.comparingDouble().reversed().
+        sortedByRating.sort(Comparator.comparingDouble(Movie::getRating).reversed());
         return sortedByRating;
     }
 
     public List<Movie> sortByYear() {
         List<Movie> sortedByYear = new ArrayList<>(movies);
-        // TODO: Sort the 'sortedByYear' list by the movie's release year in descending order (newest to oldest).
-        // Hint: Compare the year integers. Use Integer.compare() or Comparator.comparingInt().reversed().
+        sortedByYear.sort(Comparator.comparingInt(Movie::getYear).reversed());
         return sortedByYear;
     }
 
     private void setUp(String filePath) throws IOException {
-        // TODO: Create a java.io.File object using the given 'filePath'.
-        // TODO: Parse the HTML file using Jsoup.parse(file, "UTF-8"). This returns a Document object.
+        File file = new File(filePath);
+        Document doc = Jsoup.parse(file, "UTF-8");
 
-        // TODO: Extract the list of movie elements from the Document.
-        // Hint: Use document.select() or document.getElementsByClass() to find all elements with the class "movie".
+        Elements movieElements = doc.select("movie");
 
-        // TODO: Iterate through each movie Element.
-        // For each movie element:
-        // 1. Find the title element (e.g., using selector "h3.movie-title") and get its text.
-        // 2. Find the rating element (e.g., using selector "span.movie-rating"). Extract the text, remove the "/10" part, and parse it to a double.
-        // 3. Find the year element (e.g., using selector "span.movie-year"). Extract the text and parse it to an int.
-        // 4. Create a new Movie object with these values and add it to the 'movies' list.
+        for (Element movieElement : movieElements)
+        {
+            String title = movieElement.select("h3.movie-title").toString();
+
+            Double rating = Double.parseDouble(movieElement.select("span.movie-rating").toString().replace("/10",""));
+
+            int year = Integer.parseInt(movieElement.select("span.movie-year").toString());
+
+            Movie movie = new Movie(title, rating, year);
+            movies.add(movie);
+        }
     }
 }