Minor cleanup
Start looking at XML serialization
Ok, ok, now I know how to do this :)