Some uncommited hacks on Folders and Analysis