First commit - pending implementation of KNNResults