maybe working. not sure yet
i think i have it!
Merge branch 'knn2'