Reorganizing the methods and adding TODOs that will be easier to split up between several collaborators. Identifying some of the remaining questions and next directions.