Added Upload feature... Still needs work and clean up though