Change other init args to be optional / definable later