Some changes to the builder and other to be made to the shareholder constructor. Cleanup here and there. Still brainstorming for the smart strategy (j'suis sur skype si tu veux en parler)