Vast improvement to OpenCV (still WIP)