TEST
Fixed up persistence