--- a/src/FingersDance.ViewModel/AnnotationViewModel.cs	Wed Sep 16 09:07:27 2009 +0200
+++ b/src/FingersDance.ViewModel/AnnotationViewModel.cs	Wed Sep 16 15:36:08 2009 +0200
@@ -3,15 +3,23 @@
 using System.Linq;
 using System.Text;
 
-namespace FingersDance.ViewModel
+using FingersDance.Data;
+
+namespace FingersDance.ViewModels
 {
-    class AnnotationViewModel : ViewModelBase
+    public class AnnotationViewModel : ViewModelBase
     {
         private float _tcBegin;
         private float _dur;
         private String _gestureType;
 
-        public float tcBegin
+        public AnnotationViewModel(Annotation a) {
+            this._tcBegin = a.TcBegin;
+            this._dur = a.Dur;
+            this._gestureType = a.GestureType;
+        }
+
+        public float TcBegin
         {
             get { return _tcBegin; }
             set {
@@ -21,7 +29,7 @@
                 base.OnPropertyChanged("TcBegin");
             }
         }
-        public float dur
+        public float Dur
         {
             get { return _dur; }
             set
@@ -32,7 +40,7 @@
                 base.OnPropertyChanged("Dur");
             }
         }
-        public String gestureType
+        public String GestureType
         {
             get { return _gestureType; }
             set