More work on uploading
Progress on random tool generation