Quite a few restructures, preparing for adding sheep.