Fix logging and add first stab at uploads