Working on add items
Merge changes