Resolve this TODO?