Phase 1 finished except for a few clean up