adding all the todos for MVP!!!