TODO to switch this to TypedBytes ?