FileStorage partially done