Phase 1

Push source code from phase 1 to master