Implementing UserControl
Merge branch 'Phase1'