Add rest of functionality to World