Moved some state handling code into WorldState, sort of, most of it still just goes...