Added ability to add new item!
Merging changes with Nikita's work