refactoring of items and entities near complete