Added file uploading to TODOs.
Re-organized code a little.