Major revisional clean up, intial comments reworked, file uploaded refactored as well
Major revisional clean up, intial comments reworked, file uploaded refactored as well