#589

Needs binarization