Todos and steps added