Added todos. Before adding auth