Progress on Uploader class
Removed references to GeoUtils