Temporary upload 4

Everything should be in place now. Running some tests tonight for final
upload.