Done. Required moving the source to a ByteReference which is ok imo.