Can now use both histogram and keypoint tracking (and lots of refactoring). Keypoint tracking is really intensly (unusably) slow, I don't know why.