Image loading improvements.  More to come