Revert to using Fish class for player