Separated out feature computation. about to get matcher working right