Feature/shane/images management