Moved all the world time stuff into its own class