phase 2 commit

Updates for Project Phase 2