Image2

companion to -lib branch