Locations now connected as tree

Added World singlton