Commented out remaining TODO so as to prepare for publication.