Move todo out to a template file