Add back in image-select module and get some of the markup in place.