Moved Core methods to the State/World structures and polished them up