Note-repos, generic-classes almost ready