First draft of location import changes
Cleaned up and refactored location submission