Still trying to fix errors, add BinaryStream