Newer Edits, Updated TODOs for Jeff