Added Item, started refactoring