Re-organizing TODO - splitting out v1 items