Feature & toDos added