Working on image still -- checkin working copy
Checkpoint
Mostly happy with this...