Latest Commit with Phase1

Phase 1 done