Final upload of phase 1.  Contains parts of phase 2