fs: WIP REVIEW

review commit for latest round

TO BE SQUASHED