WIP update to deal with items without names