Add functionality added including view
Merged everything