Working on the images, not too trivial thou!
Added a simple testing suite.