Add shape serialization!