TODO changes: added a bunch more on the notes for abbott2