Implemented FileManager completely
fixing merge problems