Upload working pending final touches