Work on implementing world management