Finished GARRETT TODO sections