Add todos after CR