Moved pig to own class