Changed datastructures to be the most current versions, but I haven't fixed the worldState yet. Because I'm lazy, and because I have like 8,000 other projects I would rather be doing :)