Added all location stuff to a singleton.