Lots of work on shape matcher. EMD is not working right but everything else seems sane.