Again move these into a constructor for more flexibility