fs refactor part1 done