convers to using dictionary to support names
includes names in index template