Overhauled the world package. The rest are still a mess.