Finishing PhaseI
Still on phase 1; update for Andy