Continuing work on FileManager