big refactor to items -- entities next

*have to add tests