Changed core data model to include InventoryQuestion object, code works but needs refactoring