Final upload for phase 1.  Does include some functionality of phase 2