Pre phase 2 completion

almost done