Basic version working, need to test on new sets of images