started refactoring
refactoring of items to fix issues