Started refactoring SkeletonAnnotations -- work in progress.