first commit. Safe but maybe not completely refactor needed because my 2....

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