Edging closer to integrating image display
Merged Jo's changes with mine in master