Wow, that sounds like a lot to sort out. Hope you get the time and will to go through it.
I'm starting to have so much material now so not sure what to do with it all. Biggest issue I have is to make things interesting enough to keep the characters goin on their own in between the stuff I've already written down. And not to forget, get my facts right when it comes to timeline and how developed stuff was at that time and so on.