Adding some companion stuff

Adding part of the skeleton for the new companion generation system.