first cut at starting to organize storage, still tons of cleanup to do, chain state is now restored for the first time in a long time