Updated to work with the item event framework, almost everything builds now