sorry, i'm kinda taking this thread over RJ, i'm just in flight on the F40 preview stuff, which will remove some images for the future
plus started working on hwe merging (see the thread I linked)... and I see those things as cleanup which would be nice to do before adding more complexity...