added sheep factory, moved stuff