Add validation for number of shares + polish