In the middle of refactoring fs dummy setup