Rewrite of the fdb functions, storage still crashes