Index: service/hibernate/src/hibernate/org/sakaiproject/tool/gradebook/Category.hbm.xml
===================================================================
--- service/hibernate/src/hibernate/org/sakaiproject/tool/gradebook/Category.hbm.xml	(revision 52684)
+++ service/hibernate/src/hibernate/org/sakaiproject/tool/gradebook/Category.hbm.xml	(working copy)
@@ -24,6 +24,8 @@
 		<property name="drop_lowest" column="DROP_LOWEST" type="integer" not-null="false" />
 		
 		<property name="removed" column="REMOVED" type="boolean" />
+		
+		<property name="extraCredit" column="IS_EXTRA_CREDIT" type="boolean" not-null="false" />
   </class>
   
  	<database-object>
Index: service/hibernate/src/hibernate/org/sakaiproject/tool/gradebook/GradeRecord.hbm.xml
===================================================================
--- service/hibernate/src/hibernate/org/sakaiproject/tool/gradebook/GradeRecord.hbm.xml	(revision 52684)
+++ service/hibernate/src/hibernate/org/sakaiproject/tool/gradebook/GradeRecord.hbm.xml	(working copy)
@@ -30,6 +30,7 @@
 
 		<subclass name="org.sakaiproject.tool.gradebook.AssignmentGradeRecord"  discriminator-value="1">
 			<property name="pointsEarned" column="POINTS_EARNED" type="double" not-null="false" />
+			<property name="excludedFromGrade" column="IS_EXCLUDED_FROM_GRADE" type="boolean" not-null="false"/>
 		</subclass>
 
 		<subclass name="org.sakaiproject.tool.gradebook.CourseGradeRecord" discriminator-value="2">
Index: service/hibernate/src/hibernate/org/sakaiproject/tool/gradebook/GradableObject.hbm.xml
===================================================================
--- service/hibernate/src/hibernate/org/sakaiproject/tool/gradebook/GradableObject.hbm.xml	(revision 52684)
+++ service/hibernate/src/hibernate/org/sakaiproject/tool/gradebook/GradableObject.hbm.xml	(working copy)
@@ -30,6 +30,8 @@
 			<property name="externalInstructorLink" column="EXTERNAL_INSTRUCTOR_LINK" type="string" />
 			<property name="externalId" column="EXTERNAL_ID" type="string" />
 			<property name="externalAppName" column="EXTERNAL_APP_NAME" type="string" />
+			<property name="extraCredit" column="IS_EXTRA_CREDIT" type="boolean" not-null="false"/>
+			<property name="assignmentWeighting" column="ASSIGNMENT_WEIGHTING" type="double" not-null="false" />
       <property name="released" column="RELEASED" type="boolean"/>
       <many-to-one name="category" column="CATEGORY_ID" class="org.sakaiproject.tool.gradebook.Category" not-null="false"/>
       <property name="ungraded" column="UNGRADED" type="boolean"/>
Index: service/hibernate/src/java/org/sakaiproject/tool/gradebook/Assignment.java
===================================================================
--- service/hibernate/src/java/org/sakaiproject/tool/gradebook/Assignment.java	(revision 52684)
+++ service/hibernate/src/java/org/sakaiproject/tool/gradebook/Assignment.java	(working copy)
@@ -67,8 +67,11 @@
     private Category category;
     private Double averageTotal;
     private boolean ungraded;
+    private Boolean extraCredit;
+	private Double assignmentWeighting;
 
-    static {
+
+	static {
         dateComparator = new Comparator() {
             public int compare(Object o1, Object o2) {
                 if(log.isDebugEnabled()) log.debug("Comparing assignment + " + o1 + " to " + o2 + " by date");
@@ -444,4 +447,25 @@
 		{
 			this.ungraded = ungraded;
 		}
+		
+		public Boolean isExtraCredit() {
+			return extraCredit;
+		}
+
+		public Boolean getExtraCredit() {
+			return extraCredit;
+		}
+		
+		public void setExtraCredit(Boolean isExtraCredit) {
+			this.extraCredit = isExtraCredit;
+		}
+		
+		public Double getAssignmentWeighting() {
+			return assignmentWeighting;
+		}
+
+
+		public void setAssignmentWeighting(Double assignmentWeighting) {
+			this.assignmentWeighting = assignmentWeighting;
+		}
 }
\ No newline at end of file
Index: service/hibernate/src/java/org/sakaiproject/tool/gradebook/AssignmentGradeRecord.java
===================================================================
--- service/hibernate/src/java/org/sakaiproject/tool/gradebook/AssignmentGradeRecord.java	(revision 52684)
+++ service/hibernate/src/java/org/sakaiproject/tool/gradebook/AssignmentGradeRecord.java	(working copy)
@@ -38,6 +38,7 @@
     private String letterEarned;
     private Double percentEarned;
     private boolean userAbleToView;
+    private Boolean excludedFromGrade;
 
     public AssignmentGradeRecord() {
         super();
@@ -165,6 +166,18 @@
     	agr.setStudentId(studentId);
     	return agr;
     }
+
+	public Boolean isExcludedFromGrade() {
+		return excludedFromGrade;
+	}
+	
+	public Boolean getExcludedFromGrade() {
+		return excludedFromGrade;
+	}
+
+	public void setExcludedFromGrade(Boolean isExcludedFromGrade) {
+		this.excludedFromGrade = isExcludedFromGrade;
+	}
 }
 
 
Index: service/hibernate/src/java/org/sakaiproject/tool/gradebook/Category.java
===================================================================
--- service/hibernate/src/java/org/sakaiproject/tool/gradebook/Category.java	(revision 52684)
+++ service/hibernate/src/java/org/sakaiproject/tool/gradebook/Category.java	(working copy)
@@ -21,6 +21,7 @@
 	private Double mean; //mean value of percentage for this category
 	private List assignmentList;
 	private int assignmentCount;
+	private Boolean extraCredit;
 	
 	public static Comparator nameComparator;
 	public static Comparator averageScoreComparator;
@@ -342,4 +343,16 @@
 	public void setAssignmentCount(int assignmentCount){
 		this.assignmentCount = assignmentCount;
 	}
+
+	public Boolean isExtraCredit() {
+		return extraCredit;
+	}
+	
+	public Boolean getExtraCredit() {
+		return extraCredit;
+	}
+
+	public void setExtraCredit(Boolean isExtraCredit) {
+		this.extraCredit = isExtraCredit;
+	}
 }