added TODO's, removed testing @if directives for comma separated images.