Merged files - need to figure out how to display