Added TODO items to steps;