A few changes...

So I rearranged thingsa little bit. There are missing pieces here and there, but I think the story unfolds more effectively.