Work on saving figures
Removing hard path dependancies, and added dep on XMLWitch