More Serialization stuff.

Serialization Hates me.