Commit code phase 1

Commit code phase 1