Added in TODO: Consider using a checksum