Began adding export serialization