Moving things from world to map class. Still a work in progress.