Adding some items
Merge branch 'items'