Moved Location storing over to caves