Make this a constructor param?