Add TODO comment for Josh