Changed to merge notation groups (ornaments, technical and articulations)
- Needs cleanup