More work on images
Added analytics