diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/AnnotationExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/AnnotationExt.cs
index 8b1fd74b..3c83d82e 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/AnnotationExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/AnnotationExt.cs
@@ -18,12 +18,67 @@ namespace VEPROMS.CSLA.Library
 		{
 			return _Name;
 		}
+
+
+		public static IList<AnnotationType> AllTypes()
+		{
+			List<AnnotationType> tlst = new List<AnnotationType>();
+			foreach (AnnotationType at in _AllByPrimaryKey.Values)
+			{
+				tlst.Add(at);
+			}
+			return tlst;
+		}
+		public static Dictionary<string, AnnotationType> AllByName()
+		{
+			return _AllByName;
+		}
 	}
+
 	public partial class AnnotationTypeInfo
 	{
+		public static List<AnnotationTypeInfo> AllList()
+		{
+			//return _AllList;
+			return AnnotationTypeInfo._AllList;
+		}
+
 		public override string ToString()
 		{
 			return _Name;
 		}
+
 	}
+
+	public partial class Annotation
+	{
+		/// <summary>
+		/// Change the annotation type and update the Annotation record
+		/// </summary>
+		/// <param name="anotypeid"></param>
+		public void Update(int anotypeid)
+		{
+			if (_TypeID != anotypeid)
+			{
+				_TypeID = anotypeid;
+				MarkDirty(); // force the record update
+				Save();
+				//Update(); // commit record to database
+			}
+		}
+		public void CommitChanges()
+		{
+			MarkDirty(); // force the record update
+			Save(true);
+			//Update();
+		}
+	}
+
+	//public partial class AnnotationTypeAnnotations
+	//{
+	//   public static int GetAnnotationID()
+	//   {
+	//      return AnnotationTypeAnnotat
+	//   }
+	//}
 }