Start cleaning up Image
Simplify over engineered code

Have to take another approach.
Refactor again