Added more to image capture. Tested, still buggy