Changed ItemContainer to be a class