diff --git a/.classpath b/.classpath
index 8dd013afc8bf89a67e96e58f9373aa44caa05430..7a1a7d5202c4f566aaae9fc6717b71a3e6387b6c 100644
--- a/.classpath
+++ b/.classpath
@@ -4,5 +4,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="lib" path="C:/Users/Ty/Downloads/org.eclipse.emf.ecore.xmi-2.15.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bin/tdt4250/coursework/CourseworkGen.class b/bin/tdt4250/coursework/CourseworkGen.class
index 348baa3e1ac929ce14dd964b5ba6b65aae7552bd..817c349fdbf549ca7e8451815642c3a3b25ec2d8 100644
Binary files a/bin/tdt4250/coursework/CourseworkGen.class and b/bin/tdt4250/coursework/CourseworkGen.class differ
diff --git a/bin/tdt4250/coursework/CourseworkHTMLGenerator.class b/bin/tdt4250/coursework/CourseworkHTMLGenerator.class
index 5287590f03bab836bcfa3df3e987c6d868229d78..c2497f8e7e01a66f97093796ef5fa9306e79f654 100644
Binary files a/bin/tdt4250/coursework/CourseworkHTMLGenerator.class and b/bin/tdt4250/coursework/CourseworkHTMLGenerator.class differ
diff --git a/src/tdt4250/coursework/CourseworkGen.java b/src/tdt4250/coursework/CourseworkGen.java
index e8a5a42ca4c9b875f4a4c71cc437ec816015cb2f..f2af3fd53ae4e6a845af909bdaf1fa49d4eda8ad 100644
--- a/src/tdt4250/coursework/CourseworkGen.java
+++ b/src/tdt4250/coursework/CourseworkGen.java
@@ -1,5 +1,7 @@
 package tdt4250.coursework;
 
+import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.PrintStream;
 
@@ -10,27 +12,38 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 
 import tdt4250.coursework.University;
-import tdt4250.coursework.impl.CourseworkFactoryImpl;
+import tdt4250.coursework.CourseworkPackage;
+import tdt4250.coursework.util.CourseworkResourceFactoryImpl;
 
 public class CourseworkGen {
 
 	public static void main(String[] args) throws IOException {
-		University university = getQuiz(args[0]);
+		
+		University university = getQuiz();
+		CourseworkHTMLGenerator generator = new CourseworkHTMLGenerator();
+		generator.generateHTML(university);
+		System.out.println("Test");
 	}
 
-	public static University getQuiz(String uriString) throws IOException {
+	public static University getQuiz() throws IOException {
 		ResourceSet resSet = new ResourceSetImpl();
 		resSet.getPackageRegistry().put(CourseworkPackage.eNS_URI, CourseworkPackage.eINSTANCE);
-		resSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("university", new CourseworkFactoryImpl());
-		Resource resource = resSet.getResource(URI.createURI(uriString), true);
+		resSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("*", new CourseworkResourceFactoryImpl());
+		File f = new File("C:/Users/Ty/eclipse-workspace/tdt4250.coursework/model/NTNU.xmi");
+		Resource resource = resSet.getResource(URI.createFileURI(f.getAbsolutePath()), true);
 		for (EObject eObject : resource.getContents()) {
 			if (eObject instanceof University) {
-				System.out.println((University) eObject);
 				return (University) eObject;
 			}
 		}
 		return null;
 	}
-
 	
+	public static String generateHtml(University newUniversity) throws FileNotFoundException {
+		CourseworkHTMLGenerator generator = new CourseworkHTMLGenerator();
+		generator.generateHTML(newUniversity);
+		
+		//System.out.println(newUniversity.getCourse().get(0).getSemesterSpecificCourseInstance().get(0).getEvaluationform().getEvaluation());
+		return null;
+	}
 }
diff --git a/src/tdt4250/coursework/CourseworkHTMLGenerator.java b/src/tdt4250/coursework/CourseworkHTMLGenerator.java
index 4735bce28b85cffd59de11bffebea62cc3c7b73f..8ebfa2fb267c99a35ce0a6c1275878ad21f21038 100644
--- a/src/tdt4250/coursework/CourseworkHTMLGenerator.java
+++ b/src/tdt4250/coursework/CourseworkHTMLGenerator.java
@@ -1,14 +1,23 @@
 package tdt4250.coursework;
-
-import tdt4250.coursework.*;
+import java.io.FileNotFoundException;
+import java.io.PrintWriter;
 import java.util.ArrayList;
 
-public abstract class CourseworkHTMLGenerator {
+public class CourseworkHTMLGenerator {
 
-	ArrayList<String> generateHTML(University university){
+	ArrayList<String> generateHTML(University university) throws FileNotFoundException{
 		ArrayList<String> htmlPages = new ArrayList<String>();
+//		System.out.println(newUniversity.getCourse().getClass().getName());
+		PrintWriter out = new PrintWriter("C:\\Users\\Ty\\Documents\\AdvancedSoftwareDesign\\coursework.html");
+		int counter = 0;
 		for(Course course : university.getCourse()) {
 			htmlPages.add(generateCourseHTML(course));
+			counter++;
+			out.println(htmlPages);
+			System.out.println(counter);
+		}
+		for(int i = 0; i < htmlPages.size(); i++) {
+			System.out.println(htmlPages.get(i));
 		}
 		return htmlPages;
 	}
@@ -160,9 +169,4 @@ public abstract class CourseworkHTMLGenerator {
 		timetableDiv += "</table></div>";
 		return timetableDiv;
 	}
-	
-	public static void main(String[] args) {
-		Course uni = new Course();
-	}
-	
 }