Greg added some notes to the TODO