Added a task to the iteration and fixed up the working in a couple places.