More changes - working on loading images