Started refactoring FAT Manager