add back in unfinished TODOs