Fs management v3

Third version of the same branch.