Working on View
Todos
minor
Todo
Working on view