Work in progress. Code cleanup and wardrobe.xml save.