Completed XML serialization

Implemented XML Serialization for the last two methods. Verified by two
more unit tests. 85% of non-test code coverage up until this point.