Fixed FileStorage. Limited testing reveals it to be working