Updated todos.
Added Stewart review.