on going xd
Merge branch 'feature/view' into develop