Finish save to xml.  Haven't connected the closing operation with save yet.  Loading is still an empty class.
Merge origin/master