pulled a TODO out of a comment so we can see it when we review the paper
hopefully this will be the last time to rebuild this file before Phil and I review it tomorrow
fixed merge conflicts