Magor refactoring to the item/effect system begun