First Iteration of UI
Merge branch 'master' into sumedha