Location Functions

Added more to each of the location functions and separated them from the
checkLocation function