Updated World

Made some updates to World..still a work in progress.