first commit. Safe but maybe not completly refactor needed because my 2.0 image is deprecated.