Nearly done. Some problems with figure folder