diff --git a/Favorite_Movies/bin/Movies$1.class b/Favorite_Movies/bin/Movies$1.class
index 66f8cd5..e08b2ca 100644
Binary files a/Favorite_Movies/bin/Movies$1.class and b/Favorite_Movies/bin/Movies$1.class differ
diff --git a/Favorite_Movies/bin/Movies$2.class b/Favorite_Movies/bin/Movies$2.class
index 3f52bfc..5818e61 100644
Binary files a/Favorite_Movies/bin/Movies$2.class and b/Favorite_Movies/bin/Movies$2.class differ
diff --git a/Favorite_Movies/bin/Movies.class b/Favorite_Movies/bin/Movies.class
index 97bc351..7da1c9c 100644
Binary files a/Favorite_Movies/bin/Movies.class and b/Favorite_Movies/bin/Movies.class differ
diff --git a/Favorite_Movies/src/Movie.java b/Favorite_Movies/src/Movie.java
index cba9b44..6a62d3a 100644
--- a/Favorite_Movies/src/Movie.java
+++ b/Favorite_Movies/src/Movie.java
@@ -1,4 +1,93 @@
 public class Movie {
+    private int movieId;
+    private String title;
+	private int year;
+	private int length;
+	private String genre;
+	private String studioName;
+	private String producerName;
+	private String shortDescription;
+	private double avgRating;
+	private int numWatched;
     
     
+    public int getMovieId() {
+        return this.movieId;
+    }
+
+    public void setMovieId(int movieId) {
+        this.movieId = movieId;
+    }
+
+    public String getTitle() {
+        return this.title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public int getYear() {
+        return year;
+    }
+
+    public void setYear(int year) {
+        this.year = year;
+    }
+
+    public int getLength() {
+        return this.length;
+    }
+
+    public void setLength(int length) {
+        this.length = length;
+    }
+
+    public String getGenre() {
+        return this.genre;
+    }
+
+    public void setGenre(String genre) {
+        this.genre = genre;
+    }
+
+    public String getStudioName() {
+        return this.studioName;
+    }
+
+    public void setStudioName(String studioName) {
+        this.studioName = studioName;
+    }
+
+    public String getProducerName() {
+        return this.producerName;
+    }
+
+    public void setProducerName(String producerName) {
+        this.producerName = producerName;
+    }
+
+    public String getShortDescription() {
+        return this.shortDescription;
+    }
+
+    public void setShortDescription(String shortDescription) {
+        this.shortDescription = shortDescription;
+    }
+
+    public double getAvgRating() {
+        return this.avgRating;
+    }
+
+    public void setAvgRating(double avgRating) {
+        this.avgRating = avgRating;
+    }
+
+    public int getNumWatched() {
+        return numWatched;
+    }
+
+    public void setNumWatched(int numWatched) {
+        this.numWatched = numWatched;
+    }
 }
diff --git a/Favorite_Movies/src/Movies.java b/Favorite_Movies/src/Movies.java
index f820fe3..9101ba7 100644
--- a/Favorite_Movies/src/Movies.java
+++ b/Favorite_Movies/src/Movies.java
@@ -25,17 +25,7 @@ import java.io.Writer;
 
 
 public class Movies extends JFrame {
-
-private int MovieId;
-	private String Title;
-	private int Year;
-	private int Length;
-	private String Genre;
-	private String StudioName;
-	private String ProducerName;
-	private String ShortDescription;
-	private double AvgRating;
-	private int NumWatched;
+	
 	
 	private JPanel contentPane;
 	private JTextField tf_mid;
@@ -49,66 +39,6 @@ private int MovieId;
 	private JTextField tf_avgrate;
 	private JTextField tf_num_watch;
 
-public int getMovieId() {
-		return MovieId;
-	}
-	public void setMovieId(int movieId) {
-		MovieId = movieId;
-	}
-	public String getTitle() {
-		return Title;
-	}
-	public void setTitle(String title) {
-		Title = title;
-	}
-	public int getYear() {
-		return Year;
-	}
-	public void setYear(int year) {
-		Year = year;
-	}
-	public int getLength() {
-		return Length;
-	}
-	public void setLength(int length) {
-		Length = length;
-	}
-	public String getGenre() {
-		return Genre;
-	}
-	public void setGenre(String genre) {
-		Genre = genre;
-	}
-	public String getStudioName() {
-		return StudioName;
-	}
-	public void setStudioName(String studioName) {
-		StudioName = studioName;
-	}
-	public String getProducerName() {
-		return ProducerName;
-	}
-	public void setProducerName(String producerName) {
-		ProducerName = producerName;
-	}
-	public String getShortDescription() {
-		return ShortDescription;
-	}
-	public void setShortDescription(String shortDescription) {
-		ShortDescription = shortDescription;
-	}
-	public double getAvgRating() {
-		return AvgRating;
-	}
-	public void setAvgRating(double avgRating) {
-		AvgRating = avgRating;
-	}
-	public int getNumWatched() {
-		return NumWatched;
-	}
-	public void setNumWatched(int numWatched) {
-		NumWatched = numWatched;
-	}
 		
 
 	/**