Moving world view stuff into its own file