Added basic add and delete for items
Minor changes
Fixed merge problems