Add the ability to track uploads
Fix whitespace